From 98e83cda9153f2c69bf24c0bf7a1d3f2ff5fa895 Mon Sep 17 00:00:00 2001 From: Dessalines Date: Fri, 22 Nov 2019 16:18:10 -0800 Subject: [PATCH] Fixing issue with missing community. - Fixes #339 --- server/src/api/community.rs | 5 ++++- ui/src/components/community.tsx | 4 +++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/server/src/api/community.rs b/server/src/api/community.rs index 87654e649..69113d522 100644 --- a/server/src/api/community.rs +++ b/server/src/api/community.rs @@ -136,7 +136,10 @@ impl Perform for Oper { let community_id = match data.id { Some(id) => id, None => { - Community::read_from_name(&conn, data.name.to_owned().unwrap_or("main".to_string()))?.id + match Community::read_from_name(&conn, data.name.to_owned().unwrap_or("main".to_string())) { + Ok(community) => community.id, + Err(_e) => return Err(APIError::err(&self.op, "couldnt_find_community"))?, + } } }; diff --git a/ui/src/components/community.tsx b/ui/src/components/community.tsx index 8f36178c8..cfeff0852 100644 --- a/ui/src/components/community.tsx +++ b/ui/src/components/community.tsx @@ -25,7 +25,8 @@ import { fetchLimit, postRefetchSeconds, } from '../utils'; -import { T, i18n } from 'inferno-i18next'; +import { T } from 'inferno-i18next'; +import { i18n } from '../i18next'; interface State { community: CommunityI; @@ -252,6 +253,7 @@ export class Community extends Component { let op: UserOperation = msgOp(msg); if (msg.error) { alert(i18n.t(msg.error)); + this.context.router.history.push('/'); return; } else if (op == UserOperation.GetCommunity) { let res: GetCommunityResponse = msg;