From 3725a22c1c43438db5d13848828c8f3f3b74f668 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tao=20Bror=20Bojl=C3=A9n?= Date: Thu, 21 Nov 2019 19:44:27 +0000 Subject: [PATCH 1/4] fix frontend crash when node missing --- CHANGELOG.md | 1 + backend/config/dev.exs | 4 ++-- frontend/src/components/molecules/Cytoscape.tsx | 12 +++++++++++- 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 12967ca..482b1ab 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,6 +16,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Removed ### Fixed + - Fixed frontend crash when instance node missing ### Security diff --git a/backend/config/dev.exs b/backend/config/dev.exs index f17d478..53d1f3d 100644 --- a/backend/config/dev.exs +++ b/backend/config/dev.exs @@ -57,8 +57,8 @@ config :backend, Backend.Repo, pool_size: 10 config :backend, :crawler, - status_age_limit_days: 28, - status_count_limit: 1000, + status_age_limit_days: 14, + status_count_limit: 500, personal_instance_threshold: 5, crawl_interval_mins: 60, crawl_workers: 10, diff --git a/frontend/src/components/molecules/Cytoscape.tsx b/frontend/src/components/molecules/Cytoscape.tsx index 468e5ae..4de8b0a 100644 --- a/frontend/src/components/molecules/Cytoscape.tsx +++ b/frontend/src/components/molecules/Cytoscape.tsx @@ -40,7 +40,7 @@ class Cytoscape extends React.PureComponent { this.cy = cytoscape({ autoungrabify: true, container: container as any, - elements: this.props.elements, + elements: this.cleanElements(this.props.elements), hideEdgesOnViewport: true, hideLabelsOnViewport: true, layout: { @@ -341,6 +341,16 @@ class Cytoscape extends React.PureComponent { } this.cy.edges().addClass("hidden"); }; + + /* Helper function to remove edges if source or target node is missing */ + private cleanElements = (elements: cytoscape.ElementsDefinition): cytoscape.ElementsDefinition => { + const domains = new Set(elements.nodes.map(n => n.data.id)); + const edges = elements.edges.filter(e => domains.has(e.data.source) && domains.has(e.data.target)); + return { + edges, + nodes: elements.nodes + }; + }; } export default Cytoscape; From 1c76a38dbc30a1e58d2b9f054c783dda84cd13a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tao=20Bror=20Bojl=C3=A9n?= Date: Thu, 21 Nov 2019 19:47:52 +0000 Subject: [PATCH 2/4] remove backend staging server --- CHANGELOG.md | 1 + frontend/src/util.ts | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 482b1ab..56495f0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Deprecated ### Removed + - Remove staging backend server ### Fixed - Fixed frontend crash when instance node missing diff --git a/frontend/src/util.ts b/frontend/src/util.ts index efa790e..6aa214f 100644 --- a/frontend/src/util.ts +++ b/frontend/src/util.ts @@ -6,7 +6,7 @@ import { IAppState } from "./redux/types"; let API_ROOT = "http://localhost:4000/api/"; if (["true", true, 1, "1"].indexOf(process.env.REACT_APP_STAGING || "") > -1) { - API_ROOT = "https://phoenix.api-develop.fediverse.space/api/"; + API_ROOT = "https://phoenix.api.fediverse.space/api/"; } else if (process.env.NODE_ENV === "production") { API_ROOT = "https://phoenix.api.fediverse.space/api/"; } From deda1568378473c4aaadf330dddd475adad68aac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tao=20Bror=20Bojl=C3=A9n?= Date: Thu, 21 Nov 2019 20:02:32 +0000 Subject: [PATCH 3/4] update mastodon account links --- CHANGELOG.md | 1 + README.md | 19 ++++++++++++------- .../src/components/screens/LoginScreen.tsx | 4 ++-- 3 files changed, 15 insertions(+), 9 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 56495f0..c123853 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Added ### Changed +- Update links to @fediversespace Mastodon account ### Deprecated diff --git a/README.md b/README.md index 6dcccec..a7ce42c 100644 --- a/README.md +++ b/README.md @@ -2,16 +2,21 @@ The map of the fediverse that you always wanted. -Read the latest updates on Mastodon: [@fediversespace](https://cursed.technology/@fediversespace) +Read the latest updates on Mastodon: [@fediversespace](https://mastodon.social/@fediversespace) ![A screenshot of fediverse.space](screenshot.png) -1. [Requirements](#requirements) -2. [Running it](#running-it) -3. [Commands](#commands) -4. [Privacy](#privacy) -5. [Deployment](#deployment) -6. [Acknowledgements](#acknowledgements) +- [fediverse.space 🌐](#fediversespace-%f0%9f%8c%90) + - [Requirements](#requirements) + - [Running it](#running-it) + - [Backend](#backend) + - [Frontend](#frontend) + - [Commands](#commands) + - [Backend](#backend-1) + - [Frontend](#frontend-1) + - [Privacy](#privacy) + - [Deployment](#deployment) + - [Acknowledgements](#acknowledgements) ## Requirements diff --git a/frontend/src/components/screens/LoginScreen.tsx b/frontend/src/components/screens/LoginScreen.tsx index 0d43914..57f0569 100644 --- a/frontend/src/components/screens/LoginScreen.tsx +++ b/frontend/src/components/screens/LoginScreen.tsx @@ -79,11 +79,11 @@ class LoginScreen extends React.PureComponent<{}, ILoginScreenState> {

It's currently only possible to administrate Mastodon and Pleroma instances. If you want to login with a - direct message, your instance must federate with cursed.technology and vice versa. + direct message, your instance must federate with mastodon.social and vice versa.

If you run another server type, you can manually opt in or out by writing to{" "} - @fediversespace. + @fediversespace.

{content} From 074f649f2663e18df55ea3fcbedbe58c214f4402 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tao=20Bror=20Bojl=C3=A9n?= Date: Thu, 21 Nov 2019 20:03:42 +0000 Subject: [PATCH 4/4] release 2.8.4 --- CHANGELOG.md | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c123853..8ec884f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,18 +10,26 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Added ### Changed -- Update links to @fediversespace Mastodon account ### Deprecated +### Removed + +### Fixed + +### Security + +## [2.8.4 - 2019-11-21] + +### Changed +- Update links to @fediversespace Mastodon account + ### Removed - Remove staging backend server ### Fixed - Fixed frontend crash when instance node missing -### Security - ## [2.8.3 - 2019-11-19] ### Changed