Merge pull request #250 from LemmyNet/fix_user_page

Fix user page

lemmy-translations

@@ -1 +1 @@
-Subproject commit d9a3a1a04d57b9ef82076465f2b3c6dd5fad9430
+Subproject commit 764d35d913453d1fd8eeec6007f0d94f59c8b0ee

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("/");

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) {

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;

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;

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("/");

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;

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;

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;

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;

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;

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();

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;

src/shared/components/person.tsx

@@ -437,26 +437,12 @@ export class Person extends Component<any, PersonState> {
                   {i18n.t("logout")}
                 </button>
               ) : (
-                <>
+                <Link
-                  {/* TODO matrix ids aren't currently federated, so don't come back with GetPersonDetails
+                  className={"d-flex align-self-start btn btn-secondary"}
-                  <a
+                  to={`/create_private_message/recipient/${pv.person.id}`}
-                    className={`d-flex align-self-start btn btn-secondary mr-2 ${
+                >
-                      !pv.local_user.matrix_user_id && "invisible"
+                  {i18n.t("send_message")}
-                    }`}
+                </Link>
-                    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>
-                </>
               )}
             </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);

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;

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;