esoftplay-event 0.0.2-a → 0.0.2-b

package/event/firebase_socket.ts

@@ -117,7 +117,7 @@ export default function useFirebaseSocket() {
       return
     }
 
-    if (userIdKeyReplacer.get()?.priority == 1) {
+    if (userIdKeyReplacer.get()?.priority == 1 && userIdKeyReplacer.get()?.t) {
       const coll = collection(db, [getEventPath(), path, event_id].join('/'));
       const q = query(coll, orderBy('t', 'asc'), where("t", "==", userIdKeyReplacer.get().t));
       getDocs(q).then((doc) => {
@@ -168,17 +168,19 @@ export default function useFirebaseSocket() {
   // get weather function
 
   function getQueue(path: string, event_id: string, _limit: number, cb: (idx: number, key: string) => void) {
-    const instance: any = esp.mod("firestore/index")().instance()
-    const db = getFirestore(instance)
-    const coll = collection(db, [getEventPath(), path, event_id].join('/'));
-    const q = query(coll, orderBy('s', 'asc'), where("s", "<", userIdKeyReplacer.get().s));
+    if (userIdKeyReplacer.get()?.s) {
+      const instance: any = esp.mod("firestore/index")().instance()
+      const db = getFirestore(instance)
+      const coll = collection(db, [getEventPath(), path, event_id].join('/'));
+      const q = query(coll, orderBy('s', 'asc'), where("s", "<", userIdKeyReplacer.get().s));
+      getCountFromServer(q).then((v) => {
+        cb(v.data().count, userIdKeyReplacer.get().id)
+      }).catch((e) => {
+        getQueue(path, event_id, _limit, cb)
+        console.log({ e })
+      })
+    }
 
-    getCountFromServer(q).then((v) => {
-      cb(v.data().count, userIdKeyReplacer.get().id)
-    }).catch((e) => {
-      getQueue(path, event_id, _limit, cb)
-      console.log({ e })
-    })
     // /* cleanup */
     // const cdate = getDateTimebyGmt7().getTime()
     // if (!cdate) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "esoftplay-event",
-  "version": "0.0.2-a",
+  "version": "0.0.2-b",
   "description": "event module on esoftplay framework",
   "main": "index.js",
   "scripts": {