From 65606dd4138b5fa807f72a7a446ffdb0b38a0f00 Mon Sep 17 00:00:00 2001
From: Dessalines <tyhou13@gmx.com>
Date: Wed, 7 Apr 2021 11:54:38 -0400
Subject: [PATCH 1/3] Adding back in logging

---
 src/shared/components/admin-settings.tsx         | 1 +
 src/shared/components/comment-form.tsx           | 1 +
 src/shared/components/communities.tsx            | 1 +
 src/shared/components/community-form.tsx         | 1 +
 src/shared/components/community.tsx              | 1 +
 src/shared/components/create-post.tsx            | 1 +
 src/shared/components/create-private-message.tsx | 1 +
 src/shared/components/login.tsx                  | 1 +
 src/shared/components/main.tsx                   | 1 +
 src/shared/components/modlog.tsx                 | 1 +
 src/shared/components/navbar.tsx                 | 1 +
 src/shared/components/password_change.tsx        | 1 +
 src/shared/components/post-form.tsx              | 1 +
 src/shared/components/private-message-form.tsx   | 1 +
 14 files changed, 14 insertions(+)

diff --git a/src/shared/components/admin-settings.tsx b/src/shared/components/admin-settings.tsx
index 0836a16d..19856f3c 100644
--- a/src/shared/components/admin-settings.tsx
+++ b/src/shared/components/admin-settings.tsx
@@ -212,6 +212,7 @@ export class AdminSettings extends Component<any, AdminSettingsState> {
 
   parseMessage(msg: any) {
     let op = wsUserOp(msg);
+    console.log(msg);
     if (msg.error) {
       toast(i18n.t(msg.error), "danger");
       this.context.router.history.push("/");
diff --git a/src/shared/components/comment-form.tsx b/src/shared/components/comment-form.tsx
index 26775943..a2da9331 100644
--- a/src/shared/components/comment-form.tsx
+++ b/src/shared/components/comment-form.tsx
@@ -131,6 +131,7 @@ export class CommentForm extends Component<CommentFormProps, CommentFormState> {
 
   parseMessage(msg: any) {
     let op = wsUserOp(msg);
+    console.log(msg);
 
     // Only do the showing and hiding if logged in
     if (UserService.Instance.localUserView) {
diff --git a/src/shared/components/communities.tsx b/src/shared/components/communities.tsx
index 74a1ac32..953e9f1c 100644
--- a/src/shared/components/communities.tsx
+++ b/src/shared/components/communities.tsx
@@ -310,6 +310,7 @@ export class Communities extends Component<any, CommunitiesState> {
 
   parseMessage(msg: any) {
     let op = wsUserOp(msg);
+    console.log(msg);
     if (msg.error) {
       toast(i18n.t(msg.error), "danger");
       return;
diff --git a/src/shared/components/community-form.tsx b/src/shared/components/community-form.tsx
index 97d335e2..396c0f3f 100644
--- a/src/shared/components/community-form.tsx
+++ b/src/shared/components/community-form.tsx
@@ -314,6 +314,7 @@ export class CommunityForm extends Component<
 
   parseMessage(msg: any) {
     let op = wsUserOp(msg);
+    console.log(msg);
     if (msg.error) {
       toast(i18n.t(msg.error), "danger");
       this.state.loading = false;
diff --git a/src/shared/components/community.tsx b/src/shared/components/community.tsx
index bd603800..b75a816e 100644
--- a/src/shared/components/community.tsx
+++ b/src/shared/components/community.tsx
@@ -432,6 +432,7 @@ export class Community extends Component<any, State> {
 
   parseMessage(msg: any) {
     let op = wsUserOp(msg);
+    console.log(msg);
     if (msg.error) {
       toast(i18n.t(msg.error), "danger");
       this.context.router.history.push("/");
diff --git a/src/shared/components/create-post.tsx b/src/shared/components/create-post.tsx
index 00221d6d..f3d453bd 100644
--- a/src/shared/components/create-post.tsx
+++ b/src/shared/components/create-post.tsx
@@ -171,6 +171,7 @@ export class CreatePost extends Component<any, CreatePostState> {
 
   parseMessage(msg: any) {
     let op = wsUserOp(msg);
+    console.log(msg);
     if (msg.error) {
       toast(i18n.t(msg.error), "danger");
       return;
diff --git a/src/shared/components/create-private-message.tsx b/src/shared/components/create-private-message.tsx
index 3771da62..aceba6b9 100644
--- a/src/shared/components/create-private-message.tsx
+++ b/src/shared/components/create-private-message.tsx
@@ -137,6 +137,7 @@ export class CreatePrivateMessage extends Component<
 
   parseMessage(msg: any) {
     let op = wsUserOp(msg);
+    console.log(msg);
     if (msg.error) {
       toast(i18n.t(msg.error), "danger");
       this.state.loading = false;
diff --git a/src/shared/components/login.tsx b/src/shared/components/login.tsx
index 325df274..7a305f51 100644
--- a/src/shared/components/login.tsx
+++ b/src/shared/components/login.tsx
@@ -425,6 +425,7 @@ export class Login extends Component<any, State> {
 
   parseMessage(msg: any) {
     let op = wsUserOp(msg);
+    console.log(msg);
     if (msg.error) {
       toast(i18n.t(msg.error), "danger");
       this.state = this.emptyState;
diff --git a/src/shared/components/main.tsx b/src/shared/components/main.tsx
index 4fcc56a5..05624d3b 100644
--- a/src/shared/components/main.tsx
+++ b/src/shared/components/main.tsx
@@ -724,6 +724,7 @@ export class Main extends Component<any, MainState> {
 
   parseMessage(msg: any) {
     let op = wsUserOp(msg);
+    console.log(msg);
     if (msg.error) {
       toast(i18n.t(msg.error), "danger");
       return;
diff --git a/src/shared/components/modlog.tsx b/src/shared/components/modlog.tsx
index 1fc3b0b0..960eeb28 100644
--- a/src/shared/components/modlog.tsx
+++ b/src/shared/components/modlog.tsx
@@ -471,6 +471,7 @@ export class Modlog extends Component<any, ModlogState> {
 
   parseMessage(msg: any) {
     let op = wsUserOp(msg);
+    console.log(msg);
     if (msg.error) {
       toast(i18n.t(msg.error), "danger");
       return;
diff --git a/src/shared/components/navbar.tsx b/src/shared/components/navbar.tsx
index 12a6ed27..04061a11 100644
--- a/src/shared/components/navbar.tsx
+++ b/src/shared/components/navbar.tsx
@@ -380,6 +380,7 @@ export class Navbar extends Component<NavbarProps, NavbarState> {
 
   parseMessage(msg: any) {
     let op = wsUserOp(msg);
+    console.log(msg);
     if (msg.error) {
       if (msg.error == "not_logged_in") {
         UserService.Instance.logout();
diff --git a/src/shared/components/password_change.tsx b/src/shared/components/password_change.tsx
index 6469cb7b..0c30c714 100644
--- a/src/shared/components/password_change.tsx
+++ b/src/shared/components/password_change.tsx
@@ -149,6 +149,7 @@ export class PasswordChange extends Component<any, State> {
 
   parseMessage(msg: any) {
     let op = wsUserOp(msg);
+    console.log(msg);
     if (msg.error) {
       toast(i18n.t(msg.error), "danger");
       this.state.loading = false;
diff --git a/src/shared/components/post-form.tsx b/src/shared/components/post-form.tsx
index 219ca249..5ee3841f 100644
--- a/src/shared/components/post-form.tsx
+++ b/src/shared/components/post-form.tsx
@@ -606,6 +606,7 @@ export class PostForm extends Component<PostFormProps, PostFormState> {
 
   parseMessage(msg: any) {
     let op = wsUserOp(msg);
+    console.log(msg);
     if (msg.error) {
       toast(i18n.t(msg.error), "danger");
       this.state.loading = false;
diff --git a/src/shared/components/private-message-form.tsx b/src/shared/components/private-message-form.tsx
index 89d61132..a19095d7 100644
--- a/src/shared/components/private-message-form.tsx
+++ b/src/shared/components/private-message-form.tsx
@@ -225,6 +225,7 @@ export class PrivateMessageForm extends Component<
 
   parseMessage(msg: any) {
     let op = wsUserOp(msg);
+    console.log(msg);
     if (msg.error) {
       toast(i18n.t(msg.error), "danger");
       this.state.loading = false;

From c5750d62d1779dfa0302d3a449d3cb43d5f6c96e Mon Sep 17 00:00:00 2001
From: Dessalines <tyhou13@gmx.com>
Date: Wed, 7 Apr 2021 11:55:02 -0400
Subject: [PATCH 2/3] Updating translations.

---
 lemmy-translations | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lemmy-translations b/lemmy-translations
index d9a3a1a0..764d35d9 160000
--- a/lemmy-translations
+++ b/lemmy-translations
@@ -1 +1 @@
-Subproject commit d9a3a1a04d57b9ef82076465f2b3c6dd5fad9430
+Subproject commit 764d35d913453d1fd8eeec6007f0d94f59c8b0ee

From 756a811b1dbd7fc6b9fa2cfd13fe555576312d1c Mon Sep 17 00:00:00 2001
From: Dessalines <tyhou13@gmx.com>
Date: Wed, 7 Apr 2021 12:02:11 -0400
Subject: [PATCH 3/3] Fixing user page, issue with matrix button. Fixes #239

---
 src/shared/components/person.tsx | 43 +++++++++++++++++---------------
 1 file changed, 23 insertions(+), 20 deletions(-)

diff --git a/src/shared/components/person.tsx b/src/shared/components/person.tsx
index b1fec8c2..6df2fefd 100644
--- a/src/shared/components/person.tsx
+++ b/src/shared/components/person.tsx
@@ -437,26 +437,12 @@ export class Person extends Component<any, PersonState> {
                   {i18n.t("logout")}
                 </button>
               ) : (
-                <>
-                  {/* TODO matrix ids aren't currently federated, so don't come back with GetPersonDetails
-                  <a
-                    className={`d-flex align-self-start btn btn-secondary mr-2 ${
-                      !pv.local_user.matrix_user_id && "invisible"
-                    }`}
-                    rel="noopener"
-                    href={`https://matrix.to/#/${pv.local_user.matrix_user_id}`}
-                  >
-                    {i18n.t("send_secure_message")}
-                  </a>
-                */}
-
-                  <Link
-                    className={"d-flex align-self-start btn btn-secondary"}
-                    to={`/create_private_message/recipient/${pv.person.id}`}
-                  >
-                    {i18n.t("send_message")}
-                  </Link>
-                </>
+                <Link
+                  className={"d-flex align-self-start btn btn-secondary"}
+                  to={`/create_private_message/recipient/${pv.person.id}`}
+                >
+                  {i18n.t("send_message")}
+                </Link>
               )}
             </div>
             {pv.person.bio && (
@@ -496,6 +482,21 @@ export class Person extends Component<any, PersonState> {
     );
   }
 
+  // TODO this isn't used currently
+  // matrixButton() {
+  //   return (
+  //     <a
+  //     className={`d-flex align-self-start btn btn-secondary mr-2 ${
+  //       !pv.local_user.matrix_user_id && "invisible"
+  //     }`}
+  //     rel="noopener"
+  //     href={`https://matrix.to/#/${pv.local_user.matrix_user_id}`}
+  //   >
+  //       {i18n.t("send_secure_message")}
+  //   </a>
+  //   );
+  // }
+
   userSettings() {
     return (
       <div>
@@ -1111,6 +1112,7 @@ export class Person extends Component<any, PersonState> {
 
   parseMessage(msg: any) {
     let op = wsUserOp(msg);
+    console.log(msg);
     if (msg.error) {
       toast(i18n.t(msg.error), "danger");
       if (msg.error == "couldnt_find_that_username_or_email") {
@@ -1129,6 +1131,7 @@ export class Person extends Component<any, PersonState> {
       // TODO this might need to get abstracted
       let data = wsJsonToRes<GetPersonDetailsResponse>(msg).data;
       this.state.personRes = data;
+      console.log(data);
       this.setUserInfo();
       this.state.loading = false;
       this.setState(this.state);