summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--server/src/api/community.rs5
-rw-r--r--ui/src/components/community.tsx4
2 files changed, 7 insertions, 2 deletions
diff --git a/server/src/api/community.rs b/server/src/api/community.rs
index 87654e64..69113d52 100644
--- a/server/src/api/community.rs
+++ b/server/src/api/community.rs
@@ -136,7 +136,10 @@ impl Perform<GetCommunityResponse> for Oper<GetCommunity> {
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 8f36178c..cfeff085 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<any, State> {
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;