Browse Source

Adapt socket requests to new format.

main
Titouan Rigoudy 4 years ago
parent
commit
c1556d9a14
3 changed files with 9 additions and 12 deletions
  1. +2
    -4
      src/modules/login/message.ts
  2. +4
    -4
      src/modules/room/message.ts
  3. +3
    -4
      src/modules/user/message.ts

+ 2
- 4
src/modules/login/message.ts View File

@ -7,12 +7,10 @@ import {
import { SocketMessage, SocketMessageMiddleware } from "modules/socket/message"; import { SocketMessage, SocketMessageMiddleware } from "modules/socket/message";
function loginStatusRequest(): SocketMessage { function loginStatusRequest(): SocketMessage {
return {
variant: "LoginStatusRequest",
fields: [],
};
return "LoginStatusRequest";
} }
// TODO: Adapt to new response format.
function handleLoginStatusResponse(dispatch: AppDispatch, outerFields: any[]) { function handleLoginStatusResponse(dispatch: AppDispatch, outerFields: any[]) {
if (outerFields.length !== 1) { if (outerFields.length !== 1) {
console.log("LoginStatusResponse has wrong number of fields:", outerFields); console.log("LoginStatusResponse has wrong number of fields:", outerFields);


+ 4
- 4
src/modules/room/message.ts View File

@ -3,12 +3,10 @@ import { roomMessage, roomGetAll, roomSetAll } from "modules/room/slice";
import { SocketMessage, SocketMessageMiddleware } from "modules/socket/message"; import { SocketMessage, SocketMessageMiddleware } from "modules/socket/message";
function roomListRequest(): SocketMessage { function roomListRequest(): SocketMessage {
return {
variant: "RoomListRequest",
fields: [],
};
return "RoomListRequest";
} }
// TODO: Adapt to new response format.
function handleRoomListResponse(dispatch: AppDispatch, outerFields: any[]) { function handleRoomListResponse(dispatch: AppDispatch, outerFields: any[]) {
if (outerFields.length !== 1) { if (outerFields.length !== 1) {
console.log("RoomListResponse has wrong number of fields:", outerFields); console.log("RoomListResponse has wrong number of fields:", outerFields);
@ -24,6 +22,7 @@ function handleRoomListResponse(dispatch: AppDispatch, outerFields: any[]) {
dispatch(roomSetAll(rooms)); dispatch(roomSetAll(rooms));
} }
// TODO: Adapt to new response format.
function handleRoomMessageResponse(dispatch: AppDispatch, outerFields: any[]) { function handleRoomMessageResponse(dispatch: AppDispatch, outerFields: any[]) {
if (outerFields.length !== 1) { if (outerFields.length !== 1) {
console.log("RoomMessageResponse has wrong number of fields:", outerFields); console.log("RoomMessageResponse has wrong number of fields:", outerFields);
@ -34,6 +33,7 @@ function handleRoomMessageResponse(dispatch: AppDispatch, outerFields: any[]) {
} }
export const roomSocketMessageMiddleware: SocketMessageMiddleware = { export const roomSocketMessageMiddleware: SocketMessageMiddleware = {
// TODO: Adapt to new response format.
handleMessage: (dispatch, { variant, fields }) => { handleMessage: (dispatch, { variant, fields }) => {
switch (variant) { switch (variant) {
case "RoomListResponse": case "RoomListResponse":


+ 3
- 4
src/modules/user/message.ts View File

@ -3,12 +3,10 @@ import { userGetAll, userSetAll } from "modules/user/slice";
import { SocketMessage, SocketMessageMiddleware } from "modules/socket/message"; import { SocketMessage, SocketMessageMiddleware } from "modules/socket/message";
function userListRequest(): SocketMessage { function userListRequest(): SocketMessage {
return {
variant: "UserListRequest",
fields: [],
};
return "UserListRequest";
} }
// TODO: Adapt to new response format.
function handleUserListResponse(dispatch: AppDispatch, outerFields: any[]) { function handleUserListResponse(dispatch: AppDispatch, outerFields: any[]) {
if (outerFields.length !== 1) { if (outerFields.length !== 1) {
console.log("UserListResponse has wrong number of fields:", outerFields); console.log("UserListResponse has wrong number of fields:", outerFields);
@ -25,6 +23,7 @@ function handleUserListResponse(dispatch: AppDispatch, outerFields: any[]) {
} }
export const userSocketMessageMiddleware: SocketMessageMiddleware = { export const userSocketMessageMiddleware: SocketMessageMiddleware = {
// TODO: Adapt to new response format.
handleMessage: (dispatch, { variant, fields }) => { handleMessage: (dispatch, { variant, fields }) => {
switch (variant) { switch (variant) {
case "UserListResponse": case "UserListResponse":


Loading…
Cancel
Save