refactor: rm speaker check logic

push-protocol · Sep 11, 2023 · af05d27 · af05d27
1 parent 0cba72e
commit af05d27
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 61 deletions.
diff --git a/packages/restapi/src/lib/spaceV2/helpers/getIncomingIndexFromAddress.ts b/packages/restapi/src/lib/spaceV2/helpers/getIncomingIndexFromAddress.ts
diff --git a/packages/restapi/src/lib/spaceV2/helpers/getPlainAddress.ts b/packages/restapi/src/lib/spaceV2/helpers/getPlainAddress.ts
diff --git a/packages/restapi/src/lib/spaceV2/joinAsSpeaker.ts b/packages/restapi/src/lib/spaceV2/joinAsSpeaker.ts
@@ -5,60 +5,12 @@
 
 import { get } from './get';
 import { SpaceV2 } from './SpaceV2';
-import { approve } from './approve';
-import getIncomingIndexFromAddress from './helpers/getIncomingIndexFromAddress';
 import sendMetaMessage from './helpers/sendMetaMessage'
 
-import { ChatStatus, META_ACTION } from '../types';
-import getPlainAddress from '../spaceV2/helpers/getPlainAddress';
+import { META_ACTION } from '../types';
 
 export async function joinAsSpeaker(this: SpaceV2) {
     try {
-        const space = await get({
-            spaceId: this.data.spaceInfo.spaceId,
-            env: this.env,
-        });
-
-        if (space.status !== ChatStatus.ACTIVE)
-            throw new Error('Space not active yet');
-
-        // checking what is the current role of caller address
-        let isSpeaker = false;
-
-        const localAddress = getPlainAddress(this.data.local.address);
-
-        space.members.forEach((member) => {
-            if (getPlainAddress(member.wallet) === localAddress) {
-                if (member.isSpeaker) {
-                    isSpeaker = true;
-                }
-            }
-        });
-
-        console.log("🚀 ~ file: joinAsSpeaker.ts:34 ~ space.members.forEach ~ isSpeaker:", isSpeaker)
-
-        const hostAddress = getPlainAddress(space.spaceCreator);
-        const incomingIndex = getIncomingIndexFromAddress(
-            this.data.incoming,
-            hostAddress
-        );
-
-        // check if we arent already connected to the host
-        if ((isSpeaker) && incomingIndex > -1) {
-            return Promise.resolve();
-        }
-
-        // if speaker is pending then approve first or if listner is pending/not found then approve first
-        if (!isSpeaker) {
-            console.log('CALLING APPROVE');
-            await approve({
-                signer: this.signer,
-                pgpPrivateKey: this.pgpPrivateKey,
-                senderAddress: this.data.spaceInfo.spaceId,
-                env: this.env,
-            });
-        }
-
         // send meta message to host
         await sendMetaMessage({
             pgpPrivateKey: this.pgpPrivateKey,