forked from OpenWF/SpaceNinjaServer
		
	chore: remove needless query when sending clan invite (#1434)
Reviewed-on: OpenWF/SpaceNinjaServer#1434 Co-authored-by: Sainan <63328889+Sainan@users.noreply.github.com> Co-committed-by: Sainan <63328889+Sainan@users.noreply.github.com>
This commit is contained in:
		
							parent
							
								
									cfa9ec775e
								
							
						
					
					
						commit
						92cf85084f
					
				@ -35,21 +35,17 @@ export const addToGuildController: RequestHandler = async (req, res) => {
 | 
				
			|||||||
            res.status(400).json("Invalid permission");
 | 
					            res.status(400).json("Invalid permission");
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        if (
 | 
					        try {
 | 
				
			||||||
            await GuildMember.exists({
 | 
					 | 
				
			||||||
                accountId: account._id,
 | 
					 | 
				
			||||||
                guildId: payload.GuildId.$oid
 | 
					 | 
				
			||||||
            })
 | 
					 | 
				
			||||||
        ) {
 | 
					 | 
				
			||||||
            res.status(400).json("User already invited to clan");
 | 
					 | 
				
			||||||
            return;
 | 
					 | 
				
			||||||
        }
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
            await GuildMember.insertOne({
 | 
					            await GuildMember.insertOne({
 | 
				
			||||||
                accountId: account._id,
 | 
					                accountId: account._id,
 | 
				
			||||||
                guildId: payload.GuildId.$oid,
 | 
					                guildId: payload.GuildId.$oid,
 | 
				
			||||||
                status: 2 // outgoing invite
 | 
					                status: 2 // outgoing invite
 | 
				
			||||||
            });
 | 
					            });
 | 
				
			||||||
 | 
					        } catch (e) {
 | 
				
			||||||
 | 
					            logger.debug(`guild invite failed due to ${String(e)}`);
 | 
				
			||||||
 | 
					            res.status(400).json("User already invited to clan");
 | 
				
			||||||
 | 
					            return;
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        const senderInventory = await getInventory(senderAccount._id.toString(), "ActiveAvatarImageType");
 | 
					        const senderInventory = await getInventory(senderAccount._id.toString(), "ActiveAvatarImageType");
 | 
				
			||||||
        await createMessage(account._id, [
 | 
					        await createMessage(account._id, [
 | 
				
			||||||
@ -92,7 +88,7 @@ export const addToGuildController: RequestHandler = async (req, res) => {
 | 
				
			|||||||
                RequestExpiry: new Date(Date.now() + 14 * 86400 * 1000) // TOVERIFY: I can't find any good information about this with regards to live, but 2 weeks seem reasonable.
 | 
					                RequestExpiry: new Date(Date.now() + 14 * 86400 * 1000) // TOVERIFY: I can't find any good information about this with regards to live, but 2 weeks seem reasonable.
 | 
				
			||||||
            });
 | 
					            });
 | 
				
			||||||
        } catch (e) {
 | 
					        } catch (e) {
 | 
				
			||||||
            // Assuming this is "E11000 duplicate key error" due to the guildId-accountId unique index.
 | 
					            logger.debug(`alliance invite failed due to ${String(e)}`);
 | 
				
			||||||
            res.status(400).send("Already requested");
 | 
					            res.status(400).send("Already requested");
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
        res.end();
 | 
					        res.end();
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user