Fixing front end error messages. Fixes #462

diff --git a/server/src/websocket/server.rs b/server/src/websocket/server.rs
index b1d4f1387ec78b7fe524e2bebf02603ad11f5a61..f26ae0ec38925fcba030addd28e756915a71ba7a 100644 (file)
--- a/server/src/websocket/server.rs
+++ b/server/src/websocket/server.rs
@@ -291,6 +291,7 @@ impl Handler<StandardMessage> for ChatServer {
       Err(e) => e.to_string(),
     };
 
+    println!("Message Sent: {}", msg_out);
     MessageResult(msg_out)
   }
 }

diff --git a/ui/src/components/communities.tsx b/ui/src/components/communities.tsx
index 867cfd818ccca8f442992bd3944495e63e7b8dbd..b1da98827ddb193e911dca75b8cbe2d901cb5a22 100644 (file)
--- a/ui/src/components/communities.tsx
+++ b/ui/src/components/communities.tsx
@@ -235,7 +235,7 @@ export class Communities extends Component<any, CommunitiesState> {
   parseMessage(msg: WebSocketJsonResponse) {
     console.log(msg);
     let res = wsJsonToRes(msg);
-    if (res.error) {
+    if (msg.error) {
       toast(i18n.t(msg.error), 'danger');
       return;
     } else if (res.op == UserOperation.ListCommunities) {

diff --git a/ui/src/components/community-form.tsx b/ui/src/components/community-form.tsx
index 33c63c897130bba3db31460621f78295d8cb7986..c8d888be47074e12386d46f093f48e3bf3be1bda 100644 (file)
--- a/ui/src/components/community-form.tsx
+++ b/ui/src/components/community-form.tsx
@@ -261,7 +261,7 @@ export class CommunityForm extends Component<
   parseMessage(msg: WebSocketJsonResponse) {
     let res = wsJsonToRes(msg);
     console.log(msg);
-    if (res.error) {
+    if (msg.error) {
       toast(i18n.t(msg.error), 'danger');
       this.state.loading = false;
       this.setState(this.state);

diff --git a/ui/src/components/community.tsx b/ui/src/components/community.tsx
index 9d02dd8661634042df187de99de402fb8e72f6f3..221c9211eb6af81c90a17f78d340fba7424b2c76 100644 (file)
--- a/ui/src/components/community.tsx
+++ b/ui/src/components/community.tsx
@@ -258,7 +258,7 @@ export class Community extends Component<any, State> {
   parseMessage(msg: WebSocketJsonResponse) {
     console.log(msg);
     let res = wsJsonToRes(msg);
-    if (res.error) {
+    if (msg.error) {
       toast(i18n.t(msg.error), 'danger');
       this.context.router.history.push('/');
       return;

diff --git a/ui/src/components/inbox.tsx b/ui/src/components/inbox.tsx
index 5c3ff6d2b325245c86fce3b968a6b9eb28f46380..ba5cc6ad52fe26a9b65c6bded98036970a393df3 100644 (file)
--- a/ui/src/components/inbox.tsx
+++ b/ui/src/components/inbox.tsx
@@ -324,7 +324,7 @@ export class Inbox extends Component<any, InboxState> {
   parseMessage(msg: WebSocketJsonResponse) {
     console.log(msg);
     let res = wsJsonToRes(msg);
-    if (res.error) {
+    if (msg.error) {
       toast(i18n.t(msg.error), 'danger');
       return;
     } else if (res.op == UserOperation.GetReplies) {

diff --git a/ui/src/components/login.tsx b/ui/src/components/login.tsx
index ac60ba74bce85f84e4bb16dbb2f384bad726d24e..64687a3d87f87d757a76269efd64f47f96b1f67f 100644 (file)
--- a/ui/src/components/login.tsx
+++ b/ui/src/components/login.tsx
@@ -295,7 +295,7 @@ export class Login extends Component<any, State> {
 
   parseMessage(msg: WebSocketJsonResponse) {
     let res = wsJsonToRes(msg);
-    if (res.error) {
+    if (msg.error) {
       toast(i18n.t(msg.error), 'danger');
       this.state = this.emptyState;
       this.setState(this.state);

diff --git a/ui/src/components/main.tsx b/ui/src/components/main.tsx
index 9f16edb5d340983692810adb477f8be307f19c99..6bf4164ffe51324f5af915a83bd0054c33631440 100644 (file)
--- a/ui/src/components/main.tsx
+++ b/ui/src/components/main.tsx
@@ -566,7 +566,7 @@ export class Main extends Component<any, MainState> {
   parseMessage(msg: WebSocketJsonResponse) {
     console.log(msg);
     let res = wsJsonToRes(msg);
-    if (res.error) {
+    if (msg.error) {
       toast(i18n.t(msg.error), 'danger');
       return;
     } else if (res.op == UserOperation.GetFollowedCommunities) {

diff --git a/ui/src/components/modlog.tsx b/ui/src/components/modlog.tsx
index dd651092887bd166622968e5537d5014dde575a9..e03f1ff754bacd3439a59f9e5b3585dbd2048453 100644 (file)
--- a/ui/src/components/modlog.tsx
+++ b/ui/src/components/modlog.tsx
@@ -425,7 +425,7 @@ export class Modlog extends Component<any, ModlogState> {
   parseMessage(msg: WebSocketJsonResponse) {
     console.log(msg);
     let res = wsJsonToRes(msg);
-    if (res.error) {
+    if (msg.error) {
       toast(i18n.t(msg.error), 'danger');
       return;
     } else if (res.op == UserOperation.GetModlog) {

diff --git a/ui/src/components/navbar.tsx b/ui/src/components/navbar.tsx
index 849822af16d6ac220e07168641e11be8e33a623d..18ba98c9224e558b5fc0a182930acc8afcc01e69 100644 (file)
--- a/ui/src/components/navbar.tsx
+++ b/ui/src/components/navbar.tsx
@@ -202,8 +202,8 @@ export class Navbar extends Component<any, NavbarState> {
 
   parseMessage(msg: WebSocketJsonResponse) {
     let res = wsJsonToRes(msg);
-    if (res.error) {
-      if (res.error == 'not_logged_in') {
+    if (msg.error) {
+      if (msg.error == 'not_logged_in') {
         UserService.Instance.logout();
         location.reload();
       }

diff --git a/ui/src/components/post-form.tsx b/ui/src/components/post-form.tsx
index 677007caf2bc8b9ee50d04b0ea508b52168c1bcb..ebc7d7b7656e95f773c8b84df1bc24fe27882371 100644 (file)
--- a/ui/src/components/post-form.tsx
+++ b/ui/src/components/post-form.tsx
@@ -475,7 +475,7 @@ export class PostForm extends Component<PostFormProps, PostFormState> {
 
   parseMessage(msg: WebSocketJsonResponse) {
     let res = wsJsonToRes(msg);
-    if (res.error) {
+    if (msg.error) {
       toast(i18n.t(msg.error), 'danger');
       this.state.loading = false;
       this.setState(this.state);

diff --git a/ui/src/components/post.tsx b/ui/src/components/post.tsx
index 931ced2d1d5c0d7399c408eb794ab14f701c9140..f57d891376c6d10d54df92da23db414325153ee4 100644 (file)
--- a/ui/src/components/post.tsx
+++ b/ui/src/components/post.tsx
@@ -345,7 +345,7 @@ export class Post extends Component<any, PostState> {
   parseMessage(msg: WebSocketJsonResponse) {
     console.log(msg);
     let res = wsJsonToRes(msg);
-    if (res.error) {
+    if (msg.error) {
       toast(i18n.t(msg.error), 'danger');
       return;
     } else if (res.op == UserOperation.GetPost) {

diff --git a/ui/src/components/private-message-form.tsx b/ui/src/components/private-message-form.tsx
index c8627845d00ae13ac6f71d62a463c5ee7156cbbd..13b4d2eaba63bcb8ba94b2dae87f5c0bc018af45 100644 (file)
--- a/ui/src/components/private-message-form.tsx
+++ b/ui/src/components/private-message-form.tsx
@@ -283,7 +283,7 @@ export class PrivateMessageForm extends Component<
 
   parseMessage(msg: WebSocketJsonResponse) {
     let res = wsJsonToRes(msg);
-    if (res.error) {
+    if (msg.error) {
       toast(i18n.t(msg.error), 'danger');
       this.state.loading = false;
       this.setState(this.state);

diff --git a/ui/src/components/search.tsx b/ui/src/components/search.tsx
index 18b5d34199a0b8e5dc3fe8a504479451d96fd0b6..604c261730f600965db7080c5070db09f2836d69 100644 (file)
--- a/ui/src/components/search.tsx
+++ b/ui/src/components/search.tsx
@@ -479,7 +479,7 @@ export class Search extends Component<any, SearchState> {
   parseMessage(msg: WebSocketJsonResponse) {
     console.log(msg);
     let res = wsJsonToRes(msg);
-    if (res.error) {
+    if (msg.error) {
       toast(i18n.t(msg.error), 'danger');
       return;
     } else if (res.op == UserOperation.Search) {

diff --git a/ui/src/components/setup.tsx b/ui/src/components/setup.tsx
index 26475a387ea72144f2685a2cd5f6b700c4505616..25cfadef1e5380a81c5d51a5256cd487aa6060a1 100644 (file)
--- a/ui/src/components/setup.tsx
+++ b/ui/src/components/setup.tsx
@@ -188,7 +188,7 @@ export class Setup extends Component<any, State> {
 
   parseMessage(msg: WebSocketJsonResponse) {
     let res = wsJsonToRes(msg);
-    if (res.error) {
+    if (msg.error) {
       toast(i18n.t(msg.error), 'danger');
       this.state.userLoading = false;
       this.setState(this.state);

diff --git a/ui/src/components/user.tsx b/ui/src/components/user.tsx
index 09129d67ca06365be01b92e362d624df48b344c1..1475de6b265e6b39691968fa2f5eb92154a3ba2c 100644 (file)
--- a/ui/src/components/user.tsx
+++ b/ui/src/components/user.tsx
@@ -1016,12 +1016,12 @@ export class User extends Component<any, UserState> {
   parseMessage(msg: WebSocketJsonResponse) {
     console.log(msg);
     let res = wsJsonToRes(msg);
-    if (res.error) {
+    if (msg.error) {
       toast(i18n.t(msg.error), 'danger');
       this.state.deleteAccountLoading = false;
       this.state.avatarLoading = false;
       this.state.userSettingsLoading = false;
-      if (res.error == 'couldnt_find_that_username_or_email') {
+      if (msg.error == 'couldnt_find_that_username_or_email') {
         this.context.router.history.push('/');
       }
       this.setState(this.state);

diff --git a/ui/src/interfaces.ts b/ui/src/interfaces.ts
index bd954d20a4e1e2fdb2ee98ac5268c2d8fb6e255c..cd3961b5f7252f11b586bbd7d95f4647dc7f97f7 100644 (file)
--- a/ui/src/interfaces.ts
+++ b/ui/src/interfaces.ts
@@ -784,11 +784,10 @@ type ResponseType =
 export interface WebSocketResponse {
   op: UserOperation;
   data: ResponseType;
-  error?: string;
 }
 
 export interface WebSocketJsonResponse {
-  op: string;
-  data: ResponseType;
+  op?: string;
+  data?: ResponseType;
   error?: string;
 }