@mobilon-dev/chotto 0.3.107 → 0.3.109

package/dist/components/2_elements/AudioRecorder/AudioRecorder.vue2.js

@@ -1,7 +1,7 @@
-import { defineComponent as z, inject as D, ref as t, computed as j, createElementBlock as v, openBlock as p, createCommentVNode as _, createElementVNode as l, toDisplayString as x, unref as A, normalizeClass as B } from "vue";
-import { buildFilePreview as E } from "../../../hooks/uploadFile/generatePreview.js";
-import { uploadFile as L } from "../../../hooks/uploadFile/uploadFile.js";
-import { useMessageDraft as N } from "../../../hooks/useMessageDraft.js";
+import { defineComponent as D, inject as j, ref as t, computed as x, createElementBlock as v, openBlock as p, createCommentVNode as g, createElementVNode as l, toDisplayString as B, unref as C, normalizeClass as E } from "vue";
+import { buildFilePreview as L } from "../../../hooks/uploadFile/generatePreview.js";
+import { useChottoUploader as N } from "../../../hooks/uploadFile/useChottoUploader.js";
+import { useMessageDraft as T } from "../../../hooks/useMessageDraft.js";
 import "../../../hooks/useSearchModel.js";
 import "../../../hooks/useTheme.js";
 import "../../../hooks/useEmojiNative.js";
@@ -12,13 +12,13 @@ import "../../../locale/useLocale.js";
 import "../../../node_modules/linkifyjs/dist/linkify.js";
 import "../../../node_modules/linkify-string/dist/linkify-string.js";
 import "../../../functions/parseMarkdown.js";
-const T = { class: "audio-recorder__container" }, V = {
+const V = { class: "audio-recorder__container" }, O = {
   key: 0,
   class: "audio-recorder__status"
-}, O = {
+}, P = {
   key: 1,
   class: "audio-recorder__recording-container"
-}, P = { class: "audio-recorder__recording-time" }, ae = /* @__PURE__ */ z({
+}, q = { class: "audio-recorder__recording-time" }, le = /* @__PURE__ */ D({
   __name: "AudioRecorder",
   props: {
     state: {
@@ -28,69 +28,76 @@ const T = { class: "audio-recorder__container" }, V = {
     filebumpUrl: {
       type: String,
       default: null
+    },
+    uploader: {
+      type: Function,
+      default: void 0
     }
   },
-  setup(g) {
-    const C = D("chatAppId"), { getMessage: m, setMessageFile: M, setRecordingMessage: b } = N(C), y = t(), a = t(0), r = t(0), u = t(0), n = t(0), U = j(() => {
-      let s = n.value < 10 ? "0" + n.value : n.value, e = u.value < 10 ? "0" + u.value : u.value, o = r.value < 10 ? "0" + r.value : r.value, S = a.value < 10 ? "00" + a.value : a.value < 100 ? "0" + a.value : a.value;
-      return s + ":" + e + ":" + o + ":" + S;
-    }), c = t(""), d = t(!1), i = t(), f = t([]), R = t(), k = g, h = async () => {
-      if (!m().file && k.state == "active") {
+  setup(b) {
+    const U = j("chatAppId"), { getMessage: m, setMessageFile: A, setRecordingMessage: y } = T(U), R = t(), a = t(0), u = t(0), r = t(0), n = t(0), M = x(() => {
+      let s = n.value < 10 ? "0" + n.value : n.value, e = r.value < 10 ? "0" + r.value : r.value, o = u.value < 10 ? "0" + u.value : u.value, z = a.value < 10 ? "00" + a.value : a.value < 100 ? "0" + a.value : a.value;
+      return s + ":" + e + ":" + o + ":" + z;
+    }), d = t(""), c = t(!1), i = t(), f = t([]), k = t(), _ = b, { upload: h } = N({
+      uploader: () => _.uploader,
+      filebumpUrl: () => _.filebumpUrl
+    }), F = async () => {
+      if (!m().file && _.state == "active") {
         const s = await navigator.mediaDevices.getUserMedia({ audio: !0, video: !1 });
-        y.value = setInterval(() => {
-          a.value += 10, a.value == 1e3 && (a.value = 0, r.value++, r.value == 60 && (r.value = 0, u.value++, u.value == 60 && (u.value = 0, n.value++)));
-        }, 10), b(!0), d.value = !0, i.value = new MediaRecorder(s), i.value.start(), i.value.ondataavailable = (e) => {
+        R.value = setInterval(() => {
+          a.value += 10, a.value == 1e3 && (a.value = 0, u.value++, u.value == 60 && (u.value = 0, r.value++, r.value == 60 && (r.value = 0, n.value++)));
+        }, 10), y(!0), c.value = !0, i.value = new MediaRecorder(s), i.value.start(), i.value.ondataavailable = (e) => {
           f.value.push(e.data);
         };
       }
-    }, F = () => {
-      w(), R.value = void 0;
     }, I = () => {
+      w(), k.value = void 0;
+    }, S = () => {
       i.value && (i.value.stop(), i.value.onstop = async () => {
         const s = new File(f.value, "voicemessage.mp3", { type: "audio/*" }), e = URL.createObjectURL(s);
-        R.value = e, c.value = "uploading", await L(k.filebumpUrl, s).then((o) => {
-          c.value = o.status, o.status == "success" && M({
+        k.value = e, d.value = "uploading", await h(s, { kind: "audio" }).then((o) => {
+          d.value = o.status, o.status == "success" && A({
             url: o.url,
             name: o.name,
             size: o.size,
             type: o.type,
-            preview: E(o.name, o.preview)
+            preview: L(o.name, o.preview)
           });
         });
       }), w();
     }, w = () => {
-      clearInterval(y.value), a.value = 0, r.value = 0, u.value = 0, n.value = 0, b(!1), d.value = !1, i.value = void 0, f.value = [];
+      clearInterval(R.value), a.value = 0, u.value = 0, r.value = 0, n.value = 0, y(!1), c.value = !1, i.value = void 0, f.value = [];
     };
-    return (s, e) => (p(), v("div", T, [
-      c.value === "uploading" ? (p(), v("div", V, [...e[0] || (e[0] = [
+    return (s, e) => (p(), v("div", V, [
+      d.value === "uploading" ? (p(), v("div", O, [...e[0] || (e[0] = [
         l("span", null, "Загрузка файла...", -1)
-      ])])) : _("", !0),
-      d.value && c.value != "uploading" ? (p(), v("div", O, [
+      ])])) : g("", !0),
+      c.value && d.value != "uploading" ? (p(), v("div", P, [
         e[3] || (e[3] = l("span", { class: "audio-recorder__recording-icon pi pi-circle-fill" }, null, -1)),
         l("button", {
           class: "audio-recorder__button audio-recorder__button-record",
-          onClick: F
+          onClick: I
         }, [...e[1] || (e[1] = [
           l("span", { class: "pi pi-trash" }, null, -1)
         ])]),
         l("button", {
           class: "audio-recorder__button audio-recorder__button-record",
-          onClick: I
+          onClick: S
         }, [...e[2] || (e[2] = [
           l("div", { class: "audio-recorder__stop" }, null, -1)
         ])]),
-        l("span", P, x(U.value), 1)
-      ])) : _("", !0),
-      !d.value && c.value != "uploading" && !A(m)().isRecording ? (p(), v("button", {
+        l("span", q, B(M.value), 1)
+      ])) : g("", !0),
+      !c.value && d.value != "uploading" && !C(m)().isRecording ? (p(), v("button", {
         key: 2,
-        class: B(["audio-recorder__button", { "audio-recorder__button-disabled": g.state == "disabled" || A(m)().file }]),
-        onClick: h
+        class: E(["audio-recorder__button", { "audio-recorder__button-disabled": b.state == "disabled" || C(m)().file }]),
+        onClick: F
       }, [...e[4] || (e[4] = [
         l("span", { class: "pi pi-microphone" }, null, -1)
-      ])], 2)) : _("", !0)
+      ])], 2)) : g("", !0)
     ]));
   }
 });
 export {
-  ae as default
+  le as default
 };

package/dist/components/2_elements/VideoRecorder/VideoRecorder.vue.js

@@ -1,7 +1,7 @@
 import o from "./VideoRecorder.vue2.js";
 /* empty css                   */
 import r from "../../../_virtual/_plugin-vue_export-helper.js";
-const f = /* @__PURE__ */ r(o, [["__scopeId", "data-v-d1f2b0be"]]);
+const m = /* @__PURE__ */ r(o, [["__scopeId", "data-v-731d9314"]]);
 export {
-  f as default
+  m as default
 };

package/dist/components/2_elements/VideoRecorder/VideoRecorder.vue2.js

@@ -1,6 +1,6 @@
-import { defineComponent as _, inject as y, ref as b, createElementBlock as r, openBlock as i, Fragment as h, createCommentVNode as a, unref as f, normalizeClass as k, createElementVNode as n } from "vue";
-import { buildFilePreview as F } from "../../../hooks/uploadFile/generatePreview.js";
-import { uploadFile as w } from "../../../hooks/uploadFile/uploadFile.js";
+import { defineComponent as y, inject as b, ref as h, createElementBlock as r, openBlock as i, Fragment as k, createCommentVNode as n, unref as f, normalizeClass as F, createElementVNode as l } from "vue";
+import { buildFilePreview as w } from "../../../hooks/uploadFile/generatePreview.js";
+import { useChottoUploader as C } from "../../../hooks/uploadFile/useChottoUploader.js";
 import { useMessageDraft as M } from "../../../hooks/useMessageDraft.js";
 import "../../../hooks/useSearchModel.js";
 import { useTheme as R } from "../../../hooks/useTheme.js";
@@ -13,13 +13,13 @@ import { useModalVideoRecorder as V } from "../../../hooks/modals/useVideoRecord
 import "../../../node_modules/linkifyjs/dist/linkify.js";
 import "../../../node_modules/linkify-string/dist/linkify-string.js";
 import "../../../functions/parseMarkdown.js";
-const C = {
+const U = {
   key: 0,
   class: "video-recorder__container"
 }, z = {
   key: 1,
   class: "video-recorder__container"
-}, J = /* @__PURE__ */ _({
+}, K = /* @__PURE__ */ y({
   __name: "VideoRecorder",
   props: {
     state: {
@@ -29,43 +29,50 @@ const C = {
     filebumpUrl: {
       type: String,
       default: null
+    },
+    uploader: {
+      type: Function,
+      default: void 0
     }
   },
-  setup(l) {
-    const d = y("chatAppId"), { getMessage: s, setMessageFile: v, setRecordingMessage: p } = M(d), { getTheme: m } = R(d), o = b(""), c = l, g = async () => {
-      if (!s().file && c.state == "active") {
-        const u = m().theme ? m().theme : "";
+  setup(d) {
+    const p = b("chatAppId"), { getMessage: s, setMessageFile: v, setRecordingMessage: m } = M(p), { getTheme: c } = R(p), o = h(""), a = d, { upload: g } = C({
+      uploader: () => a.uploader,
+      filebumpUrl: () => a.filebumpUrl
+    }), _ = async () => {
+      if (!s().file && a.state == "active") {
+        const u = c().theme ? c().theme : "";
         await V(u).then(async (t) => {
-          t.videoFile && (o.value = "uploading", p(!0), await w(c.filebumpUrl, t.videoFile).then((e) => {
-            p(!1), o.value = e.status, e.status == "success" && v({
+          t.videoFile && (o.value = "uploading", m(!0), await g(t.videoFile, { kind: "video" }).then((e) => {
+            m(!1), o.value = e.status, e.status == "success" && v({
               url: e.url,
               name: e.name,
               size: e.size,
               type: e.type,
-              preview: F(e.name, e.preview)
+              preview: w(e.name, e.preview)
             });
           }));
         });
       }
     };
-    return (u, t) => (i(), r(h, null, [
-      f(s)().isRecording ? a("", !0) : (i(), r("div", C, [
+    return (u, t) => (i(), r(k, null, [
+      f(s)().isRecording ? n("", !0) : (i(), r("div", U, [
         o.value != "uploading" ? (i(), r("button", {
           key: 0,
-          class: k(["video-recorder__button", { "video-recorder__button-disabled": l.state == "disabled" || f(s)().file }]),
-          onClick: g
+          class: F(["video-recorder__button", { "video-recorder__button-disabled": d.state == "disabled" || f(s)().file }]),
+          onClick: _
         }, [...t[0] || (t[0] = [
-          n("span", { class: "pi pi-video" }, null, -1)
-        ])], 2)) : a("", !0)
+          l("span", { class: "pi pi-video" }, null, -1)
+        ])], 2)) : n("", !0)
       ])),
       o.value === "uploading" ? (i(), r("div", z, [...t[1] || (t[1] = [
-        n("div", { class: "video-recorder__status" }, [
-          n("span", null, "Загрузка файла...")
+        l("div", { class: "video-recorder__status" }, [
+          l("span", null, "Загрузка файла...")
         ], -1)
-      ])])) : a("", !0)
+      ])])) : n("", !0)
     ], 64));
   }
 });
 export {
-  J as default
+  K as default
 };

package/dist/hooks/messages/useMessageHoverActions.js

@@ -1,13 +1,14 @@
-import { computed as t, toValue as e } from "vue";
+import { computed as r, toValue as t } from "vue";
 import { isSmsFeedMessage as c } from "../../functions/isSmsChannel.js";
-function m(s, r = !0, i = void 0) {
-  const o = t(
-    () => !c(e(i), e(s))
-  ), n = t(
-    () => e(r) && o.value
+function f(s, n = !0, i = void 0) {
+  const o = r(() => {
+    const e = t(i);
+    return (e == null ? void 0 : e.deleted) === !0 ? !1 : !c(e, t(s));
+  }), u = r(
+    () => t(n) && o.value
   );
-  return { hoverActionsEnabled: o, reactionsActive: n };
+  return { hoverActionsEnabled: o, reactionsActive: u };
 }
 export {
-  m as useMessageHoverActions
+  f as useMessageHoverActions
 };

package/dist/hooks/uploadFile/types.js

@@ -0,0 +1,4 @@
+const o = Symbol("chottoUploadFile");
+export {
+  o as chottoUploadFileKey
+};

package/dist/hooks/uploadFile/uploadFile.js

@@ -1,28 +1,27 @@
-import { generatePreview as n } from "./generatePreview.js";
-import { getTypeFileByMime as a } from "./getTypeFileByMime.js";
-const c = async (o, r) => {
-  const t = new FormData();
-  t.append("file", r);
-  const s = (o || "https://filebump2.services.mobilon.ru") + "/upload";
+import { generatePreview as a } from "./generatePreview.js";
+import { getTypeFileByMime as s } from "./getTypeFileByMime.js";
+const m = async (e, r) => {
+  const o = new FormData();
+  o.append("file", r);
   try {
     return {
       url: (await (await fetch(
-        s,
+        e + "/upload",
         {
           method: "POST",
-          body: t
+          body: o
         }
       )).json()).url,
       name: r.name,
       size: r.size,
-      type: a(r.type),
+      type: s(r.type),
       status: "success",
-      preview: n(r)
+      preview: a(r)
     };
-  } catch (e) {
-    return console.error("Ошибка при загрузке файла:", e), { status: "error" };
+  } catch (t) {
+    return console.error("Ошибка при загрузке файла:", t), { status: "error" };
   }
 };
 export {
-  c as uploadFile
+  m as uploadFile
 };

package/dist/hooks/uploadFile/useChottoUploader.js

@@ -0,0 +1,56 @@
+import { inject as u, toValue as i } from "vue";
+import { generatePreview as f } from "./generatePreview.js";
+import { getTypeFileByMime as c } from "./getTypeFileByMime.js";
+import { chottoUploadFileKey as p } from "./types.js";
+import { uploadFile as s } from "./uploadFile.js";
+const d = "[chotto] Uploader is not provided and filebump-url is missing. Pass `uploader` prop, provide(chottoUploadFileKey), or `filebump-url`.";
+function l(e, o = "file") {
+  return e instanceof File ? e : new File([e], o, { type: e.type });
+}
+function a(e, o) {
+  if (typeof e == "function") return e;
+  if (typeof o == "function") return o;
+}
+function m(e) {
+  return typeof e == "string" ? e.trim() : "";
+}
+function y(e, o) {
+  const t = o.filename || e.name || "file";
+  return {
+    url: o.url,
+    name: t,
+    size: e.size,
+    type: c(e.type),
+    status: "success",
+    preview: f(e)
+  };
+}
+async function U(e) {
+  const o = a(e.uploader, e.injectedUploader);
+  if (o)
+    try {
+      const r = await o(e.file, e.meta);
+      if (!(r != null && r.url))
+        return console.error("[chotto] Uploader returned no url"), { status: "error" };
+      const n = e.file instanceof File ? e.file : l(e.file, r.filename || "file");
+      return y(n, r);
+    } catch (r) {
+      return console.error("Ошибка при загрузке файла:", r), { status: "error" };
+    }
+  const t = m(e.filebumpUrl);
+  return t ? s(t, l(e.file)) : (console.error(d), { status: "error" });
+}
+function w(e) {
+  const o = u(p, void 0);
+  return { upload: (r, n) => U({
+    file: r,
+    meta: n,
+    uploader: e ? i(e.uploader) : void 0,
+    injectedUploader: o,
+    filebumpUrl: e ? i(e.filebumpUrl) : void 0
+  }) };
+}
+export {
+  U as runChottoUpload,
+  w as useChottoUploader
+};