Skip to content

Commit b18bf32

Browse files
Merge pull request #13 from x-team/develop
BETA version 2
2 parents 3b122cf + 37fa6e6 commit b18bf32

File tree

4 files changed

+4
-8
lines changed

4 files changed

+4
-8
lines changed

src/games/general/commands/register.ts

-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ export const register = async (slackUserId: string) => {
2626
firebaseUserUid: null,
2727
profilePictureUrl: image_512,
2828
slackId: user.id,
29-
_teamId: null,
3029
_roleId: USER_ROLE_LEVEL.USER,
3130
_organizationId: xteamOrganization?.id,
3231
});

src/models/User.ts

-2
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,6 @@ export async function createUser(data: UserCreationAttributes) {
220220
slackId,
221221
profilePictureUrl,
222222
_roleId,
223-
_teamId,
224223
_organizationId,
225224
} = data;
226225
await User.create({
@@ -230,7 +229,6 @@ export async function createUser(data: UserCreationAttributes) {
230229
slackId,
231230
profilePictureUrl,
232231
_roleId,
233-
_teamId,
234232
_organizationId,
235233
createdAt: new Date(),
236234
updatedAt: new Date(),

src/modules/slack/slackHandlers.ts

+4-4
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ export const slackCommandHandler: Lifecycle.Method = async (request, _h) => {
3737

3838
try {
3939
return slackCommandSwitcher(slashCommandPayload);
40-
} catch (err) {
40+
} catch (err: any) {
4141
err.data = slashCommandPayload;
4242
throw err;
4343
}
@@ -53,7 +53,7 @@ export const arenaSlackActionHandler: Lifecycle.Method = async (request, _h) =>
5353
default:
5454
return handleArenaAction(slackActionPayload);
5555
}
56-
} catch (err) {
56+
} catch (err: any) {
5757
err.data = slackActionPayload;
5858
throw err;
5959
}
@@ -72,7 +72,7 @@ export const towerSlackActionHandler: Lifecycle.Method = async (request, _h) =>
7272
default:
7373
throw Boom.internal('Unknown payload');
7474
}
75-
} catch (err) {
75+
} catch (err: any) {
7676
err.data = slackActionPayload;
7777
throw err;
7878
}
@@ -118,7 +118,7 @@ export const towerSlackEventHandler: Lifecycle.Method = async (request, _h) => {
118118
return {
119119
challenge,
120120
};
121-
} catch (err) {
121+
} catch (err: any) {
122122
err.data = request.pre.slackEventsPayload;
123123
throw err;
124124
}

src/plugins/firebasePlugin.ts

-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@ const linkFirestoreUserIdToDatabaseUser = async (firebaseUser: DecodedIdToken) =
5555
firebaseUserUid: uid,
5656
profilePictureUrl: null,
5757
slackId: null,
58-
_teamId: null,
5958
_roleId: USER_ROLE_LEVEL.USER,
6059
_organizationId: xteamOrganization?.id,
6160
});

0 commit comments

Comments
 (0)