Skip to content

Commit 78e2a58

Browse files
committed
Clear gang memberships prior to creating a new one
1 parent 3a9783c commit 78e2a58

File tree

1 file changed

+12
-0
lines changed

1 file changed

+12
-0
lines changed

javascript/features/gangs/gang_database.js

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,16 @@ const GANG_CREATE_QUERY = `
102102
VALUES
103103
(?, ?, ?)`;
104104

105+
// Query to clear prior memberships when joining a new gang.
106+
const GANG_CLEAR_MEMBER_QUERY = `
107+
UPDATE
108+
users_gangs
109+
SET
110+
users_gangs.left_gang = NOW()
111+
WHERE
112+
users_gangs.user_id = ? AND
113+
users_gangs.left_gang IS NULL`;
114+
105115
// Query to add a member to a given gang in the database.
106116
const GANG_CREATE_MEMBER_QUERY = `
107117
INSERT INTO
@@ -348,6 +358,7 @@ class GangDatabase {
348358

349359
gangId = results.insertId;
350360

361+
await server.database.query(GANG_CLEAR_MEMBER_QUERY, player.account.userId);
351362
await server.database.query(
352363
GANG_CREATE_MEMBER_QUERY, player.account.userId, results.insertId, 'Leader');
353364

@@ -389,6 +400,7 @@ class GangDatabase {
389400
const userId = player.account.userId;
390401
const gangId = gang.id;
391402

403+
await server.database.query(GANG_CLEAR_MEMBER_QUERY, userId);
392404
await server.database.query(GANG_CREATE_MEMBER_QUERY, userId, gangId, 'Member');
393405
}
394406

0 commit comments

Comments
 (0)