Merge remote-tracking branch 'origin/master'

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,10 +1,10 @@
----
-name: Pull request
-about: Create a pull request to help us improve the code
-title: "Request title"
+This PR makes the following changes:
 
----
+<!-- List your changes here as a bullet list. Read the contribution guidelines for more details.-->
 
-This PR makes the following changes:
+- 
+- 
+- 
+- 
 
-<!-- List your changes here as a bullet list. Read the contribution guidelines for more details.-->
+- [] This is a release check.

package.json

@@ -1,7 +1,7 @@
 {
   "name": "hyperspace",
   "productName": "Hyperspace",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "A beautiful, fluffy client for the fediverse",
   "author": "Marquis Kurt <hyperspacedev@marquiskurt.net>",
   "repository": "https://github.com/hyperspacedev/hyperspace.git",

public/config.json

@@ -1,5 +1,5 @@
 {
-    "version": "1.0.0",
+    "version": "1.0.1",
     "location": "https://hyperspaceapp.herokuapp.com",
     "branding": {
         "name": "Hyperspace",

src/pages/Welcome.tsx

@@ -1,4 +1,4 @@
-import React, { Component, ChangeEvent } from "react";
+import React, { Component } from "react";
 import {
     withStyles,
     Paper,
@@ -26,7 +26,8 @@ import { SaveClientSession } from "../types/SessionData";
 import {
     createHyperspaceApp,
     getRedirectAddress,
-    inDisallowedDomains
+    inDisallowedDomains,
+    instancesBearerKey
 } from "../utilities/login";
 import { parseUrl } from "query-string";
 import { getConfig } from "../utilities/settings";
@@ -354,9 +355,13 @@ class WelcomePage extends Component<IWelcomeProps, IWelcomeState> {
                     } else {
                         axios
                             .get(
-                                "https://" +
-                                    baseUrl +
-                                    "/api/v1/timelines/public"
+                                "https://instances.social/api/1.0/instances/show?name=" +
+                                    baseUrl,
+                                {
+                                    headers: {
+                                        Authorization: `Bearer ${instancesBearerKey}`
+                                    }
+                                }
                             )
                             .catch((err: Error) => {
                                 let userInputError = true;

src/utilities/login.tsx

@@ -1,5 +1,8 @@
 import Mastodon from "megalodon";
 
+export const instancesBearerKey =
+    "QBEULaOyF04OKjHsHktx5reOqDUklWMSWfUiKRdcen7iLDjta8kL2ZEgozAlBScizR0LKSMcxg2su9f3VLdJt5dZyfWkSXEPlxHBUlPzBF4Ju9lAiOhklh0TLNpFZBqA";
+
 /**
  * Creates the Hyperspace app with the appropriate Redirect URI
  * @param name The name of the app (if not Hyperspace, will use `name (Hyperspace-like)`)