Skip to content

Commit afd1382

Browse files
committed
fix editor lang for second player
1 parent 394e78c commit afd1382

File tree

8 files changed

+525
-3
lines changed

8 files changed

+525
-3
lines changed

.idea/codebattle.iml

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/inspectionProfiles/Project_Default.xml

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/misc.xml

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/modules.xml

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/vcs.xml

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/workspace.xml

Lines changed: 485 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

services/app/assets/js/widgets/middlewares/Game.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,7 @@ export const changeCurrentLangAndSetTemplate = langSlug => (dispatch, getState)
113113
export const editorReady = () => (dispatch) => {
114114
initGameChannel(dispatch);
115115
channel.on('editor:data', ({ user_id: userId, lang_slug: langSlug, editor_text: text }) => {
116+
console.log(langSlug);
116117
dispatch(actions.updateEditorText({ userId, langSlug, text }));
117118
});
118119

@@ -134,7 +135,6 @@ export const editorReady = () => (dispatch) => {
134135

135136
dispatch(actions.updateUsers({ users }));
136137
dispatch(actions.setGameTask({ task }));
137-
138138
dispatch(actions.updateEditorText({
139139
userId: user1.id,
140140
text: user1.editor_text,
@@ -149,7 +149,6 @@ export const editorReady = () => (dispatch) => {
149149
langSlug: user2.editor_lang,
150150
}));
151151
}
152-
153152
dispatch(actions.updateGameStatus({ status, winner, startsAt }));
154153
});
155154

services/app/lib/codebattle/game_process/fsm.ex

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,9 @@ defmodule Codebattle.GameProcess.Fsm do
6363

6464
defstate waiting_opponent do
6565
defevent join(params), data: data do
66-
player = %Player{id: params.user.id, user: params.user}
66+
editor_lang = params.user.lang || "js"
67+
editor_text = Languages.meta() |> Map.get(editor_lang) |> Map.get(:solution_template)
68+
player = %Player{id: params.user.id, user: params.user, editor_lang: editor_lang, editor_text: editor_text}
6769
players = data.players ++ [player]
6870
next_state(:playing, %{data | players: players, starts_at: params.starts_at, task: params.task})
6971
end

0 commit comments

Comments
 (0)