Merge branch 'develop/1.1.4' into GH-208-input-error-state
This commit is contained in:
Marquis Kurt
GitHub
commit
54388e806a
|
|
@ -1,10 +1,9 @@
|
|||
---
|
||||
name: Bug report
|
||||
about: Create a report to help us improve
|
||||
title: "[Bug] Issue title"
|
||||
labels: ''
|
||||
assignees: ''
|
||||
|
||||
title: "Issue title"
|
||||
labels: "bug"
|
||||
assignees: ""
|
||||
---
|
||||
|
||||
**Describe the bug**
|
||||
|
|
@ -12,6 +11,7 @@ A clear and concise description of what the bug is.
|
|||
|
||||
**To Reproduce**
|
||||
Steps to reproduce the behavior:
|
||||
|
||||
1. Go to '...'
|
||||
2. Click on '....'
|
||||
3. Scroll down to '....'
|
||||
|
|
@ -24,9 +24,10 @@ A clear and concise description of what you expected to happen.
|
|||
If applicable, add screenshots to help explain your problem.
|
||||
|
||||
**App Information (please complete the following information):**
|
||||
- OS: [e.g. iOS]
|
||||
- Browser [e.g. chrome, safari] (if applicable)
|
||||
- Version [e.g. 22]
|
||||
|
||||
- OS: [e.g. iOS]
|
||||
- Browser [e.g. chrome, safari] (if applicable)
|
||||
- Version [e.g. 22]
|
||||
|
||||
**Additional context**
|
||||
Add any other context about the problem here.
|
||||
|
|
|
|||
|
|
@ -0,0 +1,5 @@
|
|||
blank_issues_enabled: true
|
||||
contact_links:
|
||||
- name: Discord
|
||||
url: "https://discord.gg/c69AXwk"
|
||||
about: Chat with us here.
|
||||
|
|
@ -1,10 +1,9 @@
|
|||
---
|
||||
name: Feature request
|
||||
about: Suggest an idea for this project
|
||||
title: '[Request] Request title'
|
||||
labels: ''
|
||||
assignees: ''
|
||||
|
||||
title: "Request title"
|
||||
labels: "enhancement"
|
||||
assignees: ""
|
||||
---
|
||||
|
||||
**Is your feature request related to a problem? Please describe.**
|
||||
|
|
|
|||
|
|
@ -1,10 +1,28 @@
|
|||
**Changes Overview**
|
||||
This PR makes the following changes:
|
||||
|
||||
<!-- List your changes here as a bullet list. Read the contribution guidelines for more details.-->
|
||||
-
|
||||
-
|
||||
|
||||
**Does this PR fix, close, or implement any issues?**
|
||||
- [ ] This PR closes, fixes, or implements the following issues.
|
||||
|
||||
<!-- List any issues that this pull request may close or contribute to. Make sure you follow the proper syntax for referencing an issue.
|
||||
|
||||
Examples:
|
||||
|
||||
- Implements #0
|
||||
- Closes UnscriptedVN/issues#0
|
||||
- Contributes to #0
|
||||
-->
|
||||
|
||||
-
|
||||
-
|
||||
-
|
||||
-
|
||||
|
||||
- [] This is a release check.
|
||||
<!-- If the following is a release check, uncomment the following line. -->
|
||||
<!-- - [x] This is a release check. -->
|
||||
|
||||
**Pending for review**
|
||||
@hyperspacedev/desktop
|
||||
|
|
@ -3,17 +3,36 @@ name: Build Linux Client
|
|||
on: [push, pull_request]
|
||||
|
||||
jobs:
|
||||
build_linux:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Clone source code
|
||||
uses: actions/checkout@v1
|
||||
- name: Use Node.js
|
||||
uses: actions/setup-node@v1
|
||||
with:
|
||||
node-version: 10.x
|
||||
- name: Install dependencies and build
|
||||
run: |
|
||||
npm install
|
||||
npm run build --if-present
|
||||
npm run build-desktop-linux
|
||||
build_linux:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Clone source code
|
||||
uses: actions/checkout@v1
|
||||
- name: Use Node.js
|
||||
uses: actions/setup-node@v1
|
||||
with:
|
||||
node-version: 10.x
|
||||
- name: Change desktop field
|
||||
run: |
|
||||
from json import load, dump
|
||||
|
||||
json_dict = {}
|
||||
with open('public/config.json', 'r') as file:
|
||||
json_dict = load(file)
|
||||
|
||||
json_dict["location"] = "desktop"
|
||||
|
||||
with open('public/config.json', 'w+') as out:
|
||||
dump(json_dict, out)
|
||||
shell: python
|
||||
- name: Install dependencies and build
|
||||
run: |
|
||||
npm install
|
||||
npm run build --if-present
|
||||
npm run build:linux
|
||||
- name: Upload Linux executables
|
||||
uses: actions/upload-artifact@v1
|
||||
if: success()
|
||||
with:
|
||||
name: "Linux executables (output dir)"
|
||||
path: dist
|
||||
|
|
|
|||
|
|
@ -3,46 +3,65 @@ name: Build macOS Client
|
|||
on: [push, pull_request]
|
||||
|
||||
jobs:
|
||||
build_darwin:
|
||||
runs-on: macos-latest
|
||||
steps:
|
||||
- name: Clone source code
|
||||
uses: actions/checkout@v1
|
||||
- name: Use Node.js
|
||||
uses: actions/setup-node@v1
|
||||
with:
|
||||
node-version: 10.x
|
||||
- name: Install certificates and entitlements
|
||||
if: github.actor == 'alicerunsonfedora' || github.actor == 'Nomad1556' || github.actor == 'audmaxwell'
|
||||
run: |
|
||||
echo "Downloading certificates and profiles..."
|
||||
echo "$ascCertificates" > certs.b64
|
||||
echo "$ascMasProfile" > mas.b64
|
||||
echo "$ascMacProfile" > mac.b64
|
||||
echo "$ascEntitlementsMas" > entmas.b64
|
||||
echo "$ascEntitlementsMac" > entmac.b64
|
||||
echo "$ascInfoPlist" > info.b64
|
||||
build_darwin:
|
||||
runs-on: macos-latest
|
||||
steps:
|
||||
- name: Clone source code
|
||||
uses: actions/checkout@v1
|
||||
- name: Use Node.js
|
||||
uses: actions/setup-node@v1
|
||||
with:
|
||||
node-version: 10.x
|
||||
- name: Install certificates and entitlements
|
||||
if: github.actor == 'alicerunsonfedora' || github.actor == 'Nomad1556' || github.actor == 'audmaxwell'
|
||||
run: |
|
||||
echo "Downloading certificates and profiles..."
|
||||
echo "$ascCertificates" > certs.b64
|
||||
echo "$ascMasProfile" > mas.b64
|
||||
echo "$ascMacProfile" > mac.b64
|
||||
echo "$ascEntitlementsMas" > entmas.b64
|
||||
echo "$ascEntitlementsMac" > entmac.b64
|
||||
echo "$ascInfoPlist" > info.b64
|
||||
|
||||
echo "Installing certificates and profiles..."
|
||||
base64 --decode certs.b64 > Certificates.p12
|
||||
base64 --decode mas.b64 > desktop/embedded.provisionprofile
|
||||
base64 --decode mac.b64 > desktop/nonmas.provisionprofile
|
||||
base64 --decode entmas.b64 > desktop/entitlements.mas.plist
|
||||
base64 --decode entmac.b64 > desktop/entitlements.mac.plist
|
||||
base64 --decode info.b64 > desktop/info.plist
|
||||
security add-generic-password -a "appleseed@marquiskurt.net" -w "$ascPassword" -s "AC_PASSWORD"
|
||||
sudo security import Certificates.p12 -P "$ascCertsPassword" -k /Library/Keychains/System.keychain
|
||||
env:
|
||||
ascPassword: ${{ secrets.ASC_PASSWORD }}
|
||||
ascCertificates: ${{ secrets.ASC_CERTS }}
|
||||
ascCertsPassword: ${{ secrets.ASC_CERTS_PASSWORD }}
|
||||
ascMacProfile: ${{ secrets.ASC_NONMAS_PROFILE }}
|
||||
ascMasProfile: ${{ secrets.ASC_EMBEDDED_PROFILE }}
|
||||
ascEntitlementsMas: ${{ secrets.ASC_MAS_ENTITLEMENTS }}
|
||||
ascEntitlementsMac: ${{ secrets.ASC_MAC_ENTITLEMENTS }}
|
||||
ascInfoPlist: ${{ secrets.ASC_INFO_PLIST }}
|
||||
- name: Install dependencies and build
|
||||
run: |
|
||||
npm install
|
||||
npm run build --if-present
|
||||
npm run build-desktop-darwin-nosign
|
||||
echo "Installing certificates and profiles..."
|
||||
base64 --decode certs.b64 > Certificates.p12
|
||||
base64 --decode mas.b64 > desktop/embedded.provisionprofile
|
||||
base64 --decode mac.b64 > desktop/nonmas.provisionprofile
|
||||
base64 --decode entmas.b64 > desktop/entitlements.mas.plist
|
||||
base64 --decode entmac.b64 > desktop/entitlements.mac.plist
|
||||
base64 --decode info.b64 > desktop/info.plist
|
||||
security add-generic-password -a "appleseed@marquiskurt.net" -w "$ascPassword" -s "AC_PASSWORD"
|
||||
sudo security import Certificates.p12 -P "$ascCertsPassword" -k /Library/Keychains/System.keychain
|
||||
env:
|
||||
ascPassword: ${{ secrets.ASC_PASSWORD }}
|
||||
ascCertificates: ${{ secrets.ASC_CERTS }}
|
||||
ascCertsPassword: ${{ secrets.ASC_CERTS_PASSWORD }}
|
||||
ascMacProfile: ${{ secrets.ASC_NONMAS_PROFILE }}
|
||||
ascMasProfile: ${{ secrets.ASC_EMBEDDED_PROFILE }}
|
||||
ascEntitlementsMas: ${{ secrets.ASC_MAS_ENTITLEMENTS }}
|
||||
ascEntitlementsMac: ${{ secrets.ASC_MAC_ENTITLEMENTS }}
|
||||
ascInfoPlist: ${{ secrets.ASC_INFO_PLIST }}
|
||||
- name: Change desktop field
|
||||
run: |
|
||||
from json import load, dump
|
||||
|
||||
json_dict = {}
|
||||
with open('public/config.json', 'r') as file:
|
||||
json_dict = load(file)
|
||||
|
||||
json_dict["location"] = "desktop"
|
||||
|
||||
with open('public/config.json', 'w+') as out:
|
||||
dump(json_dict, out)
|
||||
shell: python
|
||||
- name: Install dependencies and build
|
||||
run: |
|
||||
npm install
|
||||
npm run build --if-present
|
||||
npm run build:mac-unsigned
|
||||
- name: Upload macOS (unsigned) bundle
|
||||
uses: actions/upload-artifact@v1
|
||||
if: success()
|
||||
with:
|
||||
name: "macOS bundle (output dir)"
|
||||
path: dist
|
||||
|
|
|
|||
|
|
@ -3,36 +3,36 @@ name: Build Windows Client
|
|||
on: [push, pull_request]
|
||||
|
||||
jobs:
|
||||
build_win:
|
||||
runs-on: windows-latest
|
||||
steps:
|
||||
- name: Clone source code
|
||||
uses: actions/checkout@v1
|
||||
- name: Use Node.js
|
||||
uses: actions/setup-node@v1
|
||||
with:
|
||||
node-version: 10.x
|
||||
- name: Change desktop field
|
||||
run: |
|
||||
from json import load, dump
|
||||
build_win:
|
||||
runs-on: windows-latest
|
||||
steps:
|
||||
- name: Clone source code
|
||||
uses: actions/checkout@v1
|
||||
- name: Use Node.js
|
||||
uses: actions/setup-node@v1
|
||||
with:
|
||||
node-version: 10.x
|
||||
- name: Change desktop field
|
||||
run: |
|
||||
from json import load, dump
|
||||
|
||||
json_dict = {}
|
||||
with open('public/config.json', 'r') as file:
|
||||
json_dict = load(file)
|
||||
|
||||
json_dict["location"] = "desktop"
|
||||
json_dict = {}
|
||||
with open('public/config.json', 'r') as file:
|
||||
json_dict = load(file)
|
||||
|
||||
with open('public/config.json', 'w+') as out:
|
||||
dump(json_dict, out)
|
||||
shell: python
|
||||
- name: Install dependencies and build
|
||||
run: |
|
||||
npm install
|
||||
npm run build --if-present
|
||||
npm run build-desktop-win
|
||||
- name: Upload Windows executable
|
||||
uses: actions/upload-artifact@v1
|
||||
if: success()
|
||||
with:
|
||||
name: 'Windows executable (output dir)'
|
||||
path: dist
|
||||
json_dict["location"] = "desktop"
|
||||
|
||||
with open('public/config.json', 'w+') as out:
|
||||
dump(json_dict, out)
|
||||
shell: python
|
||||
- name: Install dependencies and build
|
||||
run: |
|
||||
npm install
|
||||
npm run build --if-present
|
||||
npm run build:win
|
||||
- name: Upload Windows executable
|
||||
uses: actions/upload-artifact@v1
|
||||
if: success()
|
||||
with:
|
||||
name: "Windows executable (output dir)"
|
||||
path: dist
|
||||
|
|
|
|||
|
|
@ -1,26 +0,0 @@
|
|||
name: Create issue on Jira
|
||||
|
||||
on:
|
||||
issues:
|
||||
types: [opened]
|
||||
|
||||
jobs:
|
||||
jira:
|
||||
runs-on: ubuntu-latest
|
||||
|
||||
steps:
|
||||
- name: Jira Login
|
||||
id: login
|
||||
uses: atlassian/gajira-login@v2.0.0
|
||||
env:
|
||||
JIRA_BASE_URL: "https://hyperspacedev.atlassian.net"
|
||||
JIRA_USER_EMAIL: software@marquiskurt.net
|
||||
JIRA_API_TOKEN: ${{ secrets.JIRA_TOKEN }}
|
||||
- name: Jira Create issue
|
||||
id: create
|
||||
uses: atlassian/gajira-create@v2.0.0
|
||||
with:
|
||||
project: HD
|
||||
issuetype: Unsorted
|
||||
summary: ${{ github.event.issue.title }}
|
||||
description: ${{ github.event.issue.body }}
|
||||
|
|
@ -3,18 +3,18 @@ name: Prettier
|
|||
on: [pull_request]
|
||||
|
||||
jobs:
|
||||
prettier:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Clone source code
|
||||
uses: actions/checkout@v1
|
||||
- name: Install Node
|
||||
uses: actions/setup-node@v1
|
||||
with:
|
||||
node-version: 10.x
|
||||
- name: Install dependencies and run Prettier
|
||||
run: |
|
||||
npm install
|
||||
npm run check-prettier
|
||||
env:
|
||||
CI: true
|
||||
prettier:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Clone source code
|
||||
uses: actions/checkout@v1
|
||||
- name: Install Node
|
||||
uses: actions/setup-node@v1
|
||||
with:
|
||||
node-version: 10.x
|
||||
- name: Install dependencies and run Prettier
|
||||
run: |
|
||||
npm install
|
||||
npm run test:prettier
|
||||
env:
|
||||
CI: true
|
||||
|
|
|
|||
|
|
@ -72,4 +72,7 @@ desktop/*.plist
|
|||
desktop/*.provisionprofile
|
||||
|
||||
# JetBrains IDEA directory
|
||||
.idea/
|
||||
.idea/
|
||||
|
||||
# Pesky macOS files
|
||||
**/**.DS_Store
|
||||
|
|
|
|||
251
README.md
251
README.md
|
|
@ -1,57 +1,63 @@
|
|||
<p align="center">
|
||||
<img src="desktop/app.iconset/icon_512@2x.png" width="128" max-width="25%" alt=“Hyperspace” />
|
||||
</p>
|
||||
<h1 align="center">Hyperspace</h1>
|
||||
<div align="center">
|
||||
|
||||
<p align="center">The new beautiful, fluffy client for the fediverse written in TypeScript and React</p>
|
||||
<img src="desktop/app.iconset/icon_512@2x.png" width="128" max-width="25%" alt="Hyperspace Desktop icon" />
|
||||
|
||||
|
||||
# Hyperspace Desktop
|
||||
|
||||
The new beautiful, fluffy client for the fediverse written in TypeScript and React
|
||||
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
[](https://matrix.to/#/#hypermasto:matrix.org)
|
||||
[](https://discord.gg/c69AXwk)
|
||||
 [](https://github.com/hyperspacedev/hyperspace/releases) [](LICENSE.txt) [](https://snapcraft.io/hyperspace)
|
||||
|
||||
Hyperspace is the fluffiest client for Mastodon and other fediverse networks written in TypeScript and React. Hyperspace offers a fun, clean, fast, and responsive design that scales beautifully across devices and enhances the fediverse experience.
|
||||
Socialize and communicate with your friends in the fediverse (ActivityPub-powered social networks like Mastodon and Pleroma) with Hyperspace Desktop. Browse your timelines, check in with friends, and share your experiences across the fediverse in a beautiful, clean, and customizable way.
|
||||
|
||||
## Features
|
||||
What Hyperspace Desktop offers:
|
||||
|
||||
- **Responsive by design**: Hyperspace is beautifully designed to put your content front and center and bring a familiar experience to Mastodon. View threads and profiles with ease and compose anywhere with the compose button. And, of course, Hyperspace scales across devices beautifully, providing the same experience anywhere.
|
||||
- **Customizable**: Hyperspace allows customization and configuration at every level, from the server level with branding and instance setup, down to the user level with dark mode, custom themes, and multi-user account support. And, if the default configuration settings aren't enough, anyone can make their own version of Hyperspace with custom additions.
|
||||
- **Open-source**: Hyperspace is free (libre) and open-source software. Licensed under the Non-Violent Public License, anyone can modify, redistribute, or contribute to the Hyperspace project without restriction. Hyperspace is written in TypeScript and takes advantage of multiple open-source libraries and projects such as React, Megalodon, and Material-UI, so web and Node.js developers will feel right at home.
|
||||
- A clean, responsive, and streamlined design that fits in with your Mac
|
||||
- Support for switching between accounts to access the accounts you use the most
|
||||
- Customization support, ranging from several beautiful themes to masonry layout and infinite scrolling
|
||||
- Powerful toot composer with media uploads, emojis, and polls
|
||||
- Activity and recommended views that give you insight on the community/instance you reside in
|
||||
|
||||
> If you've used Hyperspace 0.x, you'll note many changes with the 1.x and later series. You can learn more about these changes in the [migration article](MIGRATING.md).
|
||||
## Get started
|
||||
|
||||
## Downloads
|
||||
Hyperspace Desktop is available for the major desktop platforms via our downloads page, GitHub, and other store platforms where applicable.
|
||||
|
||||
Hyperspace is available for download on GitHub as well as other platforms.
|
||||
[**Download from our website ›**](https://hyperspace.marquiskurt.net/download)
|
||||
|
||||
[**Get latest release ›**](https://github.com/hyperspacedev/hyperspace/releases/latest)
|
||||
### Download from a store
|
||||
|
||||
<!--[](https://itunes.apple.com/us/app/hyperspace/id1454139710?mt=12)-->
|
||||
[](https://snapcraft.io/hyperspace) [](https://apps.apple.com/us/app/hyperspace-desktop/id1454139710?mt=12)
|
||||
|
||||
[](https://snapcraft.io/hyperspace)
|
||||
**via [WinGet](https://github.com/microsoft/winget-cli)**:
|
||||
|
||||
Looking for the Mac App Store version? [Read more ›](https://hyperspace.marquiskurt.net/2019/11/08/post.html)
|
||||
```
|
||||
winget install HyperspaceDesktop
|
||||
```
|
||||
|
||||
## Build instructions
|
||||
## Build from source
|
||||
|
||||
### Prerequisites
|
||||
|
||||
To develop Hyperspace, you'll need the following tools and packages:
|
||||
To build Hyperspace Desktop, you'll need the following tools and packages:
|
||||
|
||||
- Node.js v10 or later
|
||||
- (macOS-only) Xcode 10 or higher
|
||||
|
||||
### Installing dependencies
|
||||
|
||||
First, clone the repository from GitHub:
|
||||
|
||||
```bash
|
||||
```
|
||||
git clone https://github.com/hyperspacedev/hyperspace
|
||||
```
|
||||
|
||||
Then, in the app directory, run the following command to install all of the package dependencies:
|
||||
|
||||
```npm
|
||||
```
|
||||
npm install
|
||||
```
|
||||
|
||||
|
|
@ -60,72 +66,207 @@ npm install
|
|||
Run any of the following scripts to test:
|
||||
|
||||
- `npm start` - Starts a local server hosted at https://localhost:3000.
|
||||
- `npm run electrify` - Builds a copy of the source code and then runs the app through Electron. Ensure that the `location` key in `config.json` points to `"desktop"` before running this.
|
||||
- `npm run electrify-nobuild` - Similar to `electrify` but doesn't build the project before running.
|
||||
- `npm run electron:build` - Builds a copy of the source code and then runs the app through Electron. Ensure that the `location` key in `config.json` points to `"desktop"` before running this.
|
||||
- `npm run electron:prebuilt` - Similar to `electron:build` but doesn't build the project before running.
|
||||
|
||||
The `location` key in `config.json` can take the following values during testing:
|
||||
|
||||
- **https://localhost:3000**: Most suitable for running `npm start` or running via `react-scripts`.
|
||||
- **desktop**: Most suitable for when testing the desktop application.
|
||||
|
||||
> Note: Hyperspace v1.1.0-beta3 and older versions require the location field to be changed to `"https://localhost:3000"` before running.
|
||||
> Note: Hyperspace Desktop v1.1.0-beta3 and older versions require the location field to be changed to `"https://localhost:3000"` before running.
|
||||
|
||||
### Building a release
|
||||
|
||||
To build a release, run the following command:
|
||||
|
||||
```npm
|
||||
```
|
||||
npm run build
|
||||
```
|
||||
|
||||
The built files will be available under `build` as static files that can be hosted on a web server. If you plan to release these files alongside the desktop apps, compress these files in a ZIP.
|
||||
|
||||
#### Building desktop releases
|
||||
#### Building desktop apps
|
||||
|
||||
You can run any of the following commands to build a release for the desktop:
|
||||
|
||||
- `npm run build-desktop`: Builds the desktop apps for all platforms (eg. Windows, macOS, Linux). Will run `npm run build` before building.
|
||||
- `npm run build-desktop-win`: Builds the desktop app for Windows without running `npm run build`.
|
||||
- `npm run build-desktop-darwin`: Builds the desktop apps for macOS (eg. disk image, Mac App Store) without running `npm run build`. See the details below for more information on building for macOS.
|
||||
- `npm run build-desktop-linux`: Builds the desktop apps for Linux (eg. Debian package, AppImage, and Snap) without running `npm run build`.
|
||||
- `npm run build-desktop-linux-select`: Builds the desktop app for Linux without running `npm run build`. _Target is required as a parameter._
|
||||
- `npm run build:desktop-all`: Builds the desktop apps for all platforms (eg. Windows, macOS, Linux). Will run `npm run build` before building.
|
||||
- `npm run build:win`: Builds the desktop app for Windows without running `npm run build`.
|
||||
- `npm run build:mac`: Builds the desktop apps for macOS without running `npm run build`. See the details below for more information on building for macOS.
|
||||
- `npm run build:mas`: Builds the desktop apps for the Mac App Store without running `npm run build`. See the details below for more information on building for macOS.
|
||||
- `npm run build:linux`: Builds the desktop apps for Linux (eg. Debian package, AppImage, and Snap) without running `npm run build`.
|
||||
- `npm run build:linux-select-targets`: Builds the desktop app for Linux without running `npm run build`. _Targets are required as parameters._
|
||||
|
||||
The built files will be available under `dist` that can be uploaded to your app distributor or website.
|
||||
|
||||
#### Building for macOS
|
||||
#### Extra steps for macOS
|
||||
|
||||
More recent version of macOS require that the Hyperspace desktop app be both digitally code-signed and notarized (uploaded to Apple to check for malware). Hyperspace includes the tools necessary to automate this process when building the macOS version either by `npm run build-desktop` or by `npm run build-desktop-darwin`.
|
||||
The macOS builds of Hyperspace Desktop require a bit more effort and resources to build and distribute accordingly. The following is a quick guide to building Hyperspace Desktop for macOS and for the Mac App Store.
|
||||
|
||||
Make sure you have your provisioning profiles for the Mac App Store (`embedded.provisionprofile`) and standard distribution (`nonmas.provisionprofile`) in the `desktop` directory. These provision profiles can be obtained through Apple Developer. You'll also need to create entitlements files in the `desktop` directory that list the following entitlements for your app:
|
||||
##### Gather your tools
|
||||
|
||||
- `com.apple.security.app-sandbox`
|
||||
- `com.apple.security.files.downloads.read-write`
|
||||
- `com.apple.security.files.user-selected.read-write`
|
||||
- `com.apple.security.allow-unsigned-executable-memory`
|
||||
- `com.apple.security.network.client`
|
||||
To create a code-signed and notarized version of Hyperspace Desktop, you'll need to acquire some provisioning profiles and certificates from a valid Apple Developer account.
|
||||
|
||||
For the child ones (inherited `entitlements.mas.inherit.plist`):
|
||||
For certificates, make sure your Mac has the following certificates installed:
|
||||
|
||||
- `com.apple.security.app-sandbox`
|
||||
- `com.apple.security.inherit`
|
||||
- `com.apple.security.files.downloads.read-write`
|
||||
- `com.apple.security.files.user-selected.read-write`
|
||||
- `com.apple.security.allow-unsigned-executable-memory`
|
||||
- `com.apple.security.network.client`
|
||||
- 3rd Party Mac Developer Application
|
||||
- 3rd Party Mac Developer Installer
|
||||
- Developer ID Application
|
||||
- Developer ID Installer
|
||||
- Mac Developer
|
||||
|
||||
> ⚠️ Note that the inherited permissions are the same as that of the parent. This is due to an issue where the hardened runtime fails to pass down the inherited properties (see [electron/electron#20560](https://github.com/electron/electron/issues/20560#issuecomment-546110018)). This might change in future versions of macOS.
|
||||
The easiest way to handle this is by opening Xcode and going to **Preferences › Accounts** and create the certificates from "Manage Certificates".
|
||||
|
||||
It is also recommended to add the `com.apple.security.applications-groups` entry with your bundle's identifier. You'll also need to create an `info.plist` in the `desktop` directory containing the team identifier and application identifier and install the developer certificates on the Mac you plan to build from.
|
||||
You'll also need to [create a provisioning profile for **Mac App Store** distribution](https://developer.apple.com/account/resources/profiles/add) and save it to the `desktop` folder as `embedded.provisonprofile`.
|
||||
|
||||
You'll also want to modify the `notarize.js` file to change the details from the default to your App Store Connect account details and app identifier.
|
||||
##### Create your entitlements files
|
||||
|
||||
> ⚠️ **Warning**: The package.json file also includes the `build-desktop-darwin-nosign` script. This script is specifically intended for automated systems that cannot run notarization (Azure Pipelines, GitHub Actions, etc.). _Do not use this command to build production-ready versions of Hyperspace_.
|
||||
You'll also need to create the entitlements files in the `desktop` directory that declares the permissions for Hyperspace Desktop. Replace `TEAM_ID` with the appropriate Apple Developer information and `BUNDLE_ID` with the bundle ID of your app.
|
||||
|
||||
###### entitlements.mac.plist
|
||||
|
||||
```plist
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
|
||||
<plist version="1.0">
|
||||
<dict>
|
||||
<key>com.apple.security.cs.allow-unsigned-executable-memory</key>
|
||||
<true/>
|
||||
<key>com.apple.security.network.client</key>
|
||||
<true/>
|
||||
<key>com.apple.security.files.user-selected.read-write</key>
|
||||
<true/>
|
||||
</dict>
|
||||
</plist>
|
||||
```
|
||||
|
||||
###### entitlements.mas.plist
|
||||
|
||||
```plist
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
|
||||
<plist version="1.0">
|
||||
<dict>
|
||||
<key>com.apple.security.cs.allow-jit</key>
|
||||
<true/>
|
||||
<key>com.apple.security.network.client</key>
|
||||
<true/>
|
||||
<key>com.apple.security.app-sandbox</key>
|
||||
<true/>
|
||||
<key>com.apple.security.cs.allow-unsigned-executable-memory</key>
|
||||
<true/>
|
||||
<key>com.apple.security.application-groups</key>
|
||||
<array>
|
||||
<string>TEAM_ID.BUNDLE_ID</string>
|
||||
</array>
|
||||
<key>com.apple.security.files.user-selected.read-only</key>
|
||||
<true/>
|
||||
<key>com.apple.security.files.user-selected.read-write</key>
|
||||
<true/>
|
||||
</dict>
|
||||
</plist>
|
||||
```
|
||||
|
||||
###### entitlements.mas.inherit.plist
|
||||
|
||||
```plist
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
|
||||
<plist version="1.0">
|
||||
<dict>
|
||||
<key>com.apple.security.app-sandbox</key>
|
||||
<true/>
|
||||
<key>com.apple.security.inherit</key>
|
||||
<true/>
|
||||
<key>com.apple.security.cs.allow-jit</key>
|
||||
<true/>
|
||||
<key>com.apple.security.cs.allow-unsigned-executable-memory</key>
|
||||
<true/>
|
||||
</dict>
|
||||
</plist>
|
||||
```
|
||||
|
||||
###### entitlements.mas.loginhelper.plist
|
||||
|
||||
```plist
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
|
||||
<plist version="1.0">
|
||||
<dict>
|
||||
<key>com.apple.security.app-sandbox</key>
|
||||
<true/>
|
||||
</dict>
|
||||
</plist>
|
||||
```
|
||||
|
||||
###### info.plist
|
||||
|
||||
```plist
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
|
||||
<plist version="1.0">
|
||||
<dict>
|
||||
<key>ElectronTeamID</key>
|
||||
<string>TEAM_ID</string>
|
||||
<key>com.apple.developer.team-identifier</key>
|
||||
<string>TEAM_ID</string>
|
||||
<key>com.apple.application-identifier</key>
|
||||
<string>TEAM_ID.BUNDLE_ID</string>
|
||||
</dict>
|
||||
</plist>
|
||||
```
|
||||
|
||||
##### Edit `notarize.js`
|
||||
|
||||
You'll also need to edit `notarize.js` in the `desktop` directory. Replace `<TEAM_ID>`, `<BUNDLE_ID>`, and `<APPLE_DEVELOPER_EMAIL>` with the appropriate information from the app and your account from Apple Developer.
|
||||
|
||||
```js
|
||||
// notarize.js
|
||||
// Script to notarize Hyperspace for macOS
|
||||
// © 2019 Hyperspace developers. Licensed under Apache 2.0.
|
||||
|
||||
const { notarize } = require("electron-notarize");
|
||||
|
||||
// This is pulled from the Apple Keychain. To set this up,
|
||||
// follow the instructions provided here:
|
||||
// https://github.com/electron/electron-notarize#safety-when-using-appleidpassword
|
||||
const password = `@keychain:AC_PASSWORD`;
|
||||
|
||||
exports.default = async function notarizing(context) {
|
||||
const { electronPlatformName, appOutDir } = context;
|
||||
if (electronPlatformName !== "darwin") {
|
||||
return;
|
||||
}
|
||||
|
||||
console.log("Notarizing Hyperspace...");
|
||||
|
||||
const appName = context.packager.appInfo.productFilename;
|
||||
|
||||
return await notarize({
|
||||
appBundleId: "<BUNDLE_ID>",
|
||||
appPath: `${appOutDir}/${appName}.app`,
|
||||
appleId: "<APPLE_DEVELOPER_EMAIL>",
|
||||
appleIdPassword: password,
|
||||
ascProvider: "<TEAM_ID>"
|
||||
});
|
||||
};
|
||||
```
|
||||
|
||||
Note that the password is pulled from your keychain. You'll need to create an app password and store it in your keychain as `AC_PASSWORD`.
|
||||
|
||||
##### Build the apps
|
||||
|
||||
Run any of the following commands to build Hyperspace Desktop for the Mac:
|
||||
|
||||
- `npm run build:mac` - Builds the macOS app in a DMG container.
|
||||
- `npm run build:mac-unsigned` - Similar to `build:mac`, but skips code signing and notarization. **Use only for CI or in situations where code signing and notarization is not available.**
|
||||
- `npm run build:mas` - Builds the Mac App Store package.
|
||||
|
||||
## Licensing and Credits
|
||||
|
||||
Hyperspace is licensed under the [Non-violent Public License v4+](LICENSE.txt), a permissive license under the conditions that you do not use this for any unethical purposes and to file patent claims. Please read what your rights are as a Hyperspace user/developer in the license for more information.
|
||||
Hyperspace Desktop is licensed under the [Non-violent Public License v4+](LICENSE.txt), a permissive license under the conditions that you do not use this for any unethical purposes and to file patent claims. Please read what your rights are as a Hyperspace Desktop user/developer in the license for more information.
|
||||
|
||||
Hyperspace has been made possible by the React, TypeScript, Megalodon, and Material-UI projects as well our [Patrons](patreon.md) and our contributors on GitHub.
|
||||
Hyperspace Desktop has been made possible by the React, TypeScript, Megalodon, and Material-UI projects as well our [Patrons](patreon.md) and our contributors on GitHub.
|
||||
|
||||
## Contribute
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,43 @@
|
|||
#
|
||||
# Hyperspace Desktop MAS Build Config
|
||||
# (C) 2020 Hyperspace Developers. Licensed under NPLv4.
|
||||
#
|
||||
# The following configuration file is used to configure the Mac App Store builds of Hyperspace
|
||||
# Desktop. For building cross-platform apps without submitting to the Mac App Store, modify the
|
||||
# standard.yml config file.
|
||||
#
|
||||
|
||||
appId: net.marquiskurt.hyperspace
|
||||
afterSign: desktop/notarize.js
|
||||
directories:
|
||||
buildResources: desktop
|
||||
|
||||
# The bundleVersion and bundleShortVersion keys in this config correspond to builds in the
|
||||
# Mac App Store. If you are attempting to upload a new build of the same app version to the
|
||||
# Mac App Store, change the bundle version. The bundle short version should be the same as
|
||||
# the app version seen in config.json and package.json.
|
||||
#
|
||||
# If you are submitting a new app version entirely, make sure the bundle version and short
|
||||
# version match accordingly, except in cases where the app version is the same version as an
|
||||
# older Mac App Store build.
|
||||
mac:
|
||||
bundleVersion: "1.1.5"
|
||||
bundleShortVersion: "1.1.3"
|
||||
category: public.app-category.social-networking
|
||||
icon: desktop/app.icns
|
||||
target: [dmg]
|
||||
darkModeSupport: true
|
||||
hardenedRuntime: false
|
||||
gatekeeperAssess: false
|
||||
|
||||
# Note that you will need the proper entitlements files for the following keys below. Refer to
|
||||
# the Hyperspace Desktop documentation regarding what keys will need to be inserted into the
|
||||
# entitlements files:
|
||||
# https://hyperspace.marquiskurt.net/docs/desktop-build-desktop.html
|
||||
mas:
|
||||
entitlements: desktop/entitlements.mas.plist
|
||||
entitlementsInherit: desktop/entitlements.mas.inherit.plist
|
||||
provisioningProfile: desktop/embedded.provisionprofile
|
||||
|
||||
dmg:
|
||||
sign: false
|
||||
|
|
@ -0,0 +1,35 @@
|
|||
#
|
||||
# Hyperspace Desktop Build Config
|
||||
# (C) 2020 Hyperspace Developers. Licensed under NPLv4.
|
||||
#
|
||||
# The following configuration file is used to configure and build the cross-platforms apps,
|
||||
# excluding the Mac App Store build. For the Mac App Store build, modify the mas.yml file.
|
||||
#
|
||||
|
||||
appId: net.marquiskurt.hyperspace
|
||||
afterSign: desktop/notarize.js
|
||||
directories:
|
||||
buildResources: desktop
|
||||
|
||||
mac:
|
||||
category: public.app-category.social-networking
|
||||
icon: desktop/app.icns
|
||||
target: [dmg]
|
||||
darkModeSupport: true
|
||||
hardenedRuntime: true
|
||||
|
||||
dmg:
|
||||
sign: false
|
||||
|
||||
win:
|
||||
target: [nsis]
|
||||
icon: desktop/app.ico
|
||||
|
||||
linux:
|
||||
target: ["${@:1}"]
|
||||
icon: linux
|
||||
category: Network
|
||||
|
||||
snap:
|
||||
confinement: strict
|
||||
summary: The fluffiest client for the fediverse
|
||||
File diff suppressed because it is too large
Load Diff
91
package.json
91
package.json
|
|
@ -19,47 +19,48 @@
|
|||
"@types/react-router-dom": "^4.3.5",
|
||||
"@types/react-swipeable-views": "latest",
|
||||
"axios": "^0.19.2",
|
||||
"electron": "^6.1.9",
|
||||
"electron-builder": "^21.2.0",
|
||||
"electron": "^9.0.5",
|
||||
"electron-builder": "^22.7.0",
|
||||
"emoji-mart": "^2.11.2",
|
||||
"file-dialog": "^0.0.7",
|
||||
"material-ui-pickers": "^2.2.4",
|
||||
"mdi-material-ui": "^5.23.0",
|
||||
"mdi-material-ui": "^5.27.0",
|
||||
"megalodon": "^0.6.4",
|
||||
"moment": "^2.24.0",
|
||||
"moment": "^2.27.0",
|
||||
"notistack": "^0.5.1",
|
||||
"prettier": "^1.19.1",
|
||||
"query-string": "^6.11.1",
|
||||
"react": "^16.13.0",
|
||||
"react-dom": "^16.13.0",
|
||||
"react-router-dom": "^5.1.2",
|
||||
"react-scripts": "^3.4.0",
|
||||
"query-string": "^6.13.1",
|
||||
"react": "^16.13.1",
|
||||
"react-dom": "^16.13.1",
|
||||
"react-router-dom": "^5.2.0",
|
||||
"react-scripts": "^3.4.1",
|
||||
"react-swipeable-views": "^0.13.9",
|
||||
"react-web-share-api": "^0.0.2",
|
||||
"typescript": "^3.8.3"
|
||||
"typescript": "^3.9.5"
|
||||
},
|
||||
"dependencies": {
|
||||
"electron-notarize": "^0.1.1",
|
||||
"electron-updater": "^4.2.5",
|
||||
"electron-updater": "^4.3.1",
|
||||
"electron-window-state": "^5.0.3",
|
||||
"react-masonry-css": "^1.0.14"
|
||||
},
|
||||
"main": "public/electron.js",
|
||||
"scripts": {
|
||||
"start": "react-scripts start",
|
||||
"electrify": "npm run build; electron .",
|
||||
"electrify-nobuild": "electron .",
|
||||
"build": "react-scripts build",
|
||||
"create-mac-icon": "cd desktop; iconutil -c icns app.iconset; cd ..",
|
||||
"build-desktop": "npm run build; npm run create-mac-icon; electron-builder -p 'never' -mwl deb AppImage snap",
|
||||
"build-desktop-win": "electron-builder -p 'never' -w",
|
||||
"build-desktop-darwin": "npm run create-mac-icon; electron-builder -p 'never' -m",
|
||||
"build-desktop-darwin-nosign": "npm run create-mac-icon; electron-builder -p 'never' -m dmg -c.mac.identity=null -c.afterSign=\"desktop/donothing.js\"",
|
||||
"build-desktop-linux": "electron-builder -p 'never' -l deb AppImage snap",
|
||||
"build-desktop-linux-select": "electron-builder -p 'never' -l ",
|
||||
"check-prettier": "prettier --check src/**/**.tsx",
|
||||
"test": "react-scripts test",
|
||||
"eject": "react-scripts eject"
|
||||
"test:prettier": "prettier --check src/**/**.tsx",
|
||||
"eject": "react-scripts eject",
|
||||
"electron:build": "npm run build; electron .",
|
||||
"electron:prebuilt": "electron .",
|
||||
"build": "react-scripts build",
|
||||
"build:icns": "iconutil -c icns desktop/app.iconset -o desktop/app.icns",
|
||||
"build:desktop-all": "npm run build; npm run build:icns; electron-builder -p 'never' -mwl deb AppImage snap -c ebuild/standard.yml",
|
||||
"build:win": "electron-builder -p 'never' -w -c ebuild/standard.yml",
|
||||
"build:mac": "npm run build:icns; electron-builder -p 'never' -m -c ebuild/standard.yml",
|
||||
"build:mac-unsigned": "npm run build:icns; electron-builder -p 'never' -m dmg -c.mac.identity=null -c.afterSign=\"desktop/donothing.js\" -c ebuild/standard.yml",
|
||||
"build:mas": "npm run build:icns; electron-builder -p 'never' -m mas -c ebuild/mas.yml",
|
||||
"build:linux": "electron-builder -p 'never' -l deb AppImage snap -c ebuild/standard.yml",
|
||||
"build:linux-select-targets": "electron-builder -p 'never' -c ebuild/standard.yml -l "
|
||||
},
|
||||
"eslintConfig": {
|
||||
"extends": "react-app"
|
||||
|
|
@ -69,47 +70,5 @@
|
|||
"not dead",
|
||||
"not ie <= 11",
|
||||
"not op_mini all"
|
||||
],
|
||||
"build": {
|
||||
"appId": "net.marquiskurt.hyperspace",
|
||||
"afterSign": "desktop/notarize.js",
|
||||
"directories": {
|
||||
"buildResources": "desktop"
|
||||
},
|
||||
"mac": {
|
||||
"category": "public.app-category.social-networking",
|
||||
"icon": "desktop/app.icns",
|
||||
"target": [
|
||||
"dmg",
|
||||
"mas"
|
||||
],
|
||||
"darkModeSupport": true,
|
||||
"hardenedRuntime": true
|
||||
},
|
||||
"mas": {
|
||||
"entitlements": "desktop/entitlements.mas.plist",
|
||||
"entitlementsInherit": "desktop/entitlements.mas.inherit.plist",
|
||||
"provisioningProfile": "desktop/embedded.provisionprofile"
|
||||
},
|
||||
"dmg": {
|
||||
"sign": false
|
||||
},
|
||||
"win": {
|
||||
"target": [
|
||||
"nsis"
|
||||
],
|
||||
"icon": "desktop/app.ico"
|
||||
},
|
||||
"linux": {
|
||||
"target": [
|
||||
"${@:1}"
|
||||
],
|
||||
"icon": "linux",
|
||||
"category": "Network"
|
||||
},
|
||||
"snap": {
|
||||
"confinement": "strict",
|
||||
"summary": "A beautiful, fluffy client for the fediverse"
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,10 +2,17 @@
|
|||
// Electron script to run Hyperspace as an app
|
||||
// © 2018 Hyperspace developers. Licensed under NPL v1.
|
||||
|
||||
const { app, Menu, protocol, BrowserWindow, shell, systemPreferences } = require('electron');
|
||||
const windowStateKeeper = require('electron-window-state');
|
||||
const { autoUpdater } = require('electron-updater');
|
||||
const path = require('path');
|
||||
const {
|
||||
app,
|
||||
Menu,
|
||||
protocol,
|
||||
BrowserWindow,
|
||||
shell,
|
||||
systemPreferences
|
||||
} = require("electron");
|
||||
const windowStateKeeper = require("electron-window-state");
|
||||
const { autoUpdater } = require("electron-updater");
|
||||
const path = require("path");
|
||||
|
||||
// Check for any updates to the app
|
||||
autoUpdater.checkForUpdatesAndNotify();
|
||||
|
|
@ -18,7 +25,7 @@ let mainWindow;
|
|||
// file:// protocol, which is necessary for Mastodon to redirect
|
||||
// to when authorizing Hyperspace.
|
||||
protocol.registerSchemesAsPrivileged([
|
||||
{ scheme: 'hyperspace', privileges: { standard: true, secure: true } }
|
||||
{ scheme: "hyperspace", privileges: { standard: true, secure: true } }
|
||||
]);
|
||||
|
||||
/**
|
||||
|
|
@ -33,80 +40,81 @@ function isDarwin() {
|
|||
* Register the protocol for Hyperspace
|
||||
*/
|
||||
function registerProtocol() {
|
||||
protocol.registerFileProtocol('hyperspace', (request, callback) => {
|
||||
|
||||
// Check to make sure we're doing a GET request
|
||||
if (request.method !== "GET") {
|
||||
callback({error: -322});
|
||||
return null;
|
||||
protocol.registerFileProtocol(
|
||||
"hyperspace",
|
||||
(request, callback) => {
|
||||
// Check to make sure we're doing a GET request
|
||||
if (request.method !== "GET") {
|
||||
callback({ error: -322 });
|
||||
return null;
|
||||
}
|
||||
|
||||
// Check to make sure we're actually working with a hyperspace
|
||||
// protocol and that the host is 'hyperspace'
|
||||
const parsedUrl = new URL(request.url);
|
||||
if (parsedUrl.protocol !== "hyperspace:") {
|
||||
callback({ error: -302 });
|
||||
return;
|
||||
}
|
||||
|
||||
if (parsedUrl.host !== "hyperspace") {
|
||||
callback({ error: -105 });
|
||||
return;
|
||||
}
|
||||
|
||||
// Convert the parsed URL to a list of strings.
|
||||
const target = parsedUrl.pathname.split("/");
|
||||
|
||||
// Check that the target isn't trying to go somewhere
|
||||
// else. If it is, throw a "FILE_NOT_FOUND" error
|
||||
if (target[0] !== "") {
|
||||
callback({ error: -6 });
|
||||
return;
|
||||
}
|
||||
|
||||
// Check if the last target item in the list is empty.
|
||||
// If so, replace it with "index.html" so that it can
|
||||
// load a page.
|
||||
if (target[target.length - 1] === "") {
|
||||
target[target.length - 1] = "index.html";
|
||||
}
|
||||
|
||||
// Check the middle target and redirect to the appropriate
|
||||
// build files of the desktop app when running.
|
||||
let baseDirectory;
|
||||
if (target[1] === "app" || target[1] === "oauth") {
|
||||
baseDirectory = __dirname + "/../build/";
|
||||
} else {
|
||||
// If it doesn't match above, throw a "FILE_NOT_FOUND" error.
|
||||
callback({ error: -6 });
|
||||
return;
|
||||
}
|
||||
|
||||
// Create a normalized version of the string.
|
||||
baseDirectory = path.normalize(baseDirectory);
|
||||
|
||||
// Check to make sure the target isn't trying to go out of bounds.
|
||||
// If it is, throw a "FILE_NOT_FOUND" error.
|
||||
const relTarget = path.normalize(path.join(...target.slice(2)));
|
||||
if (relTarget.startsWith("..")) {
|
||||
callback({ error: -6 });
|
||||
return;
|
||||
}
|
||||
|
||||
// Create the absolute target path and return it.
|
||||
const absTarget = path.join(baseDirectory, relTarget);
|
||||
callback({ path: absTarget });
|
||||
},
|
||||
error => {
|
||||
if (error) console.error("Failed to register protocol");
|
||||
}
|
||||
|
||||
// Check to make sure we're actually working with a hyperspace
|
||||
// protocol and that the host is 'hyperspace'
|
||||
const parsedUrl = new URL(request.url);
|
||||
if (parsedUrl.protocol !== "hyperspace:") {
|
||||
callback({error: -302});
|
||||
return;
|
||||
}
|
||||
|
||||
if (parsedUrl.host !== "hyperspace") {
|
||||
callback({error: -105});
|
||||
return;
|
||||
}
|
||||
|
||||
// Convert the parsed URL to a list of strings.
|
||||
const target = parsedUrl.pathname.split("/");
|
||||
|
||||
// Check that the target isn't trying to go somewhere
|
||||
// else. If it is, throw a "FILE_NOT_FOUND" error
|
||||
if (target[0] !== "") {
|
||||
callback({error: -6});
|
||||
return;
|
||||
}
|
||||
|
||||
// Check if the last target item in the list is empty.
|
||||
// If so, replace it with "index.html" so that it can
|
||||
// load a page.
|
||||
if (target[target.length -1] === "") {
|
||||
target[target.length -1] = "index.html";
|
||||
}
|
||||
|
||||
// Check the middle target and redirect to the appropriate
|
||||
// build files of the desktop app when running.
|
||||
let baseDirectory;
|
||||
if (target[1] === "app" || target[1] === "oauth") {
|
||||
baseDirectory = __dirname + "/../build/";
|
||||
} else {
|
||||
// If it doesn't match above, throw a "FILE_NOT_FOUND" error.
|
||||
callback({error: -6});
|
||||
}
|
||||
|
||||
// Create a normalized version of the string.
|
||||
baseDirectory = path.normalize(baseDirectory);
|
||||
|
||||
// Check to make sure the target isn't trying to go out of bounds.
|
||||
// If it is, throw a "FILE_NOT_FOUND" error.
|
||||
const relTarget = path.normalize(path.join(...target.slice(2)));
|
||||
if (relTarget.startsWith('..')) {
|
||||
callback({error: -6});
|
||||
return;
|
||||
}
|
||||
|
||||
// Create the absolute target path and return it.
|
||||
const absTarget = path.join(baseDirectory, relTarget);
|
||||
callback({ path: absTarget });
|
||||
|
||||
}, (error) => {
|
||||
if (error) console.error('Failed to register protocol');
|
||||
});
|
||||
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
* Create the window and all of its properties
|
||||
*/
|
||||
function createWindow() {
|
||||
|
||||
// Create a window state manager that keeps track of the width
|
||||
// and height of the main window.
|
||||
let mainWindowState = windowStateKeeper({
|
||||
|
|
@ -115,68 +123,72 @@ function createWindow() {
|
|||
});
|
||||
|
||||
// Create a browser window with some settings
|
||||
mainWindow = new BrowserWindow(
|
||||
{
|
||||
// Use the values from the window state keeper
|
||||
// to draw the window exactly as it was left.
|
||||
// If not possible, derive it from the default
|
||||
// values defined earlier.
|
||||
x: mainWindowState.x,
|
||||
y: mainWindowState.y,
|
||||
width: mainWindowState.width,
|
||||
height: mainWindowState.height,
|
||||
|
||||
// Set a minimum width to prevent element collisions.
|
||||
minWidth: 300,
|
||||
mainWindow = new BrowserWindow({
|
||||
// Use the values from the window state keeper
|
||||
// to draw the window exactly as it was left.
|
||||
// If not possible, derive it from the default
|
||||
// values defined earlier.
|
||||
x: mainWindowState.x,
|
||||
y: mainWindowState.y,
|
||||
width: mainWindowState.width,
|
||||
height: mainWindowState.height,
|
||||
|
||||
// Set important web preferences.
|
||||
webPreferences: {nodeIntegration: true},
|
||||
// Set a minimum width to prevent element collisions.
|
||||
minWidth: 300,
|
||||
|
||||
// Set some preferences that are specific to macOS.
|
||||
titleBarStyle: 'hiddenInset',
|
||||
vibrancy: "sidebar",
|
||||
transparent: isDarwin(),
|
||||
backgroundColor: isDarwin()? "#80000000": "#FFF",
|
||||
// Set important web preferences.
|
||||
webPreferences: { nodeIntegration: true },
|
||||
|
||||
// Hide the window until the contents load
|
||||
show: false
|
||||
}
|
||||
);
|
||||
// Set some preferences that are specific to macOS.
|
||||
titleBarStyle: "hiddenInset",
|
||||
vibrancy: "sidebar",
|
||||
transparent: isDarwin(),
|
||||
backgroundColor: isDarwin() ? "#80000000" : "#FFF",
|
||||
|
||||
// Hide the window until the contents load
|
||||
show: false
|
||||
});
|
||||
|
||||
// Set up event listeners to track changes in the window state.
|
||||
mainWindowState.manage(mainWindow);
|
||||
|
||||
|
||||
// Load the main app and open the index page.
|
||||
mainWindow.loadURL("hyperspace://hyperspace/app/");
|
||||
|
||||
|
||||
// Watch for a change in macOS's dark mode and reload the window to apply changes, as well as accent color
|
||||
if (isDarwin()) {
|
||||
systemPreferences.subscribeNotification('AppleInterfaceThemeChangedNotification', () => {
|
||||
if (mainWindow != null) {
|
||||
mainWindow.webContents.reload();
|
||||
systemPreferences.subscribeNotification(
|
||||
"AppleInterfaceThemeChangedNotification",
|
||||
() => {
|
||||
if (mainWindow != null) {
|
||||
mainWindow.webContents.reload();
|
||||
}
|
||||
}
|
||||
});
|
||||
);
|
||||
|
||||
systemPreferences.subscribeNotification('AppleColorPreferencesChangedNotification', () => {
|
||||
if (mainWindow != null) {
|
||||
mainWindow.webContents.reload();
|
||||
systemPreferences.subscribeNotification(
|
||||
"AppleColorPreferencesChangedNotification",
|
||||
() => {
|
||||
if (mainWindow != null) {
|
||||
mainWindow.webContents.reload();
|
||||
}
|
||||
}
|
||||
});
|
||||
);
|
||||
}
|
||||
|
||||
// Only show the window when ready
|
||||
mainWindow.once('ready-to-show', () => {
|
||||
mainWindow.once("ready-to-show", () => {
|
||||
mainWindow.show();
|
||||
});
|
||||
|
||||
// Delete the window when closed
|
||||
mainWindow.on('closed', () => {
|
||||
mainWindow = null
|
||||
mainWindow.on("closed", () => {
|
||||
mainWindow = null;
|
||||
});
|
||||
|
||||
// Hijack any links with a blank target and open them in the default
|
||||
// browser instead of a new Electron window
|
||||
mainWindow.webContents.on('new-window', (event, url) => {
|
||||
mainWindow.webContents.on("new-window", (event, url) => {
|
||||
event.preventDefault();
|
||||
shell.openExternal(url);
|
||||
});
|
||||
|
|
@ -199,18 +211,17 @@ function safelyGoTo(url) {
|
|||
* Create the menu bar and attach it to a window
|
||||
*/
|
||||
function createMenubar() {
|
||||
|
||||
// Create an instance of the Menu class
|
||||
let menu = Menu;
|
||||
|
||||
|
||||
// Create a menu bar template
|
||||
const menuBar = [
|
||||
{
|
||||
label: 'File',
|
||||
label: "File",
|
||||
submenu: [
|
||||
{
|
||||
label: 'New Window',
|
||||
accelerator: 'CmdOrCtrl+N',
|
||||
label: "New Window",
|
||||
accelerator: "CmdOrCtrl+N",
|
||||
click() {
|
||||
if (mainWindow == null) {
|
||||
registerProtocol();
|
||||
|
|
@ -219,106 +230,110 @@ function createMenubar() {
|
|||
}
|
||||
},
|
||||
{
|
||||
label: 'New Post',
|
||||
accelerator: 'Shift+CmdOrCtrl+N',
|
||||
label: "New Post",
|
||||
accelerator: "Shift+CmdOrCtrl+N",
|
||||
click() {
|
||||
safelyGoTo("hyperspace://hyperspace/app/#compose")
|
||||
safelyGoTo("hyperspace://hyperspace/app/#compose");
|
||||
}
|
||||
}
|
||||
|
||||
]
|
||||
},
|
||||
{
|
||||
label: 'Edit',
|
||||
label: "Edit",
|
||||
submenu: [
|
||||
{ role: 'undo' },
|
||||
{ role: 'redo' },
|
||||
{ type: 'separator' },
|
||||
{ role: 'cut' },
|
||||
{ role: 'copy' },
|
||||
{ role: 'paste' },
|
||||
{ role: 'pasteandmatchstyle' },
|
||||
{ role: 'delete' },
|
||||
{ role: 'selectall' }
|
||||
{ role: "undo" },
|
||||
{ role: "redo" },
|
||||
{ type: "separator" },
|
||||
{ role: "cut" },
|
||||
{ role: "copy" },
|
||||
{ role: "paste" },
|
||||
{ role: "pasteandmatchstyle" },
|
||||
{ role: "delete" },
|
||||
{ role: "selectall" }
|
||||
]
|
||||
},
|
||||
{
|
||||
label: 'View',
|
||||
label: "View",
|
||||
submenu: [
|
||||
{
|
||||
label: 'Back',
|
||||
accelerator: 'CmdOrCtrl+[',
|
||||
label: "Back",
|
||||
accelerator: "CmdOrCtrl+[",
|
||||
click() {
|
||||
if (mainWindow != null && mainWindow.webContents.canGoBack()) {
|
||||
mainWindow.webContents.goBack()
|
||||
if (
|
||||
mainWindow != null &&
|
||||
mainWindow.webContents.canGoBack()
|
||||
) {
|
||||
mainWindow.webContents.goBack();
|
||||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
label: 'Forward',
|
||||
accelerator: 'CmdOrCtrl+]',
|
||||
label: "Forward",
|
||||
accelerator: "CmdOrCtrl+]",
|
||||
click() {
|
||||
if (mainWindow != null && mainWindow.webContents.canGoForward()) {
|
||||
mainWindow.webContents.goForward()
|
||||
if (
|
||||
mainWindow != null &&
|
||||
mainWindow.webContents.canGoForward()
|
||||
) {
|
||||
mainWindow.webContents.goForward();
|
||||
}
|
||||
}
|
||||
},
|
||||
{ role: 'reload' },
|
||||
{ role: 'forcereload' },
|
||||
{ type: 'separator' },
|
||||
{ role: "reload" },
|
||||
{ role: "forcereload" },
|
||||
{ type: "separator" },
|
||||
{
|
||||
label: 'Open Dev Tools',
|
||||
click () {
|
||||
label: "Open Dev Tools",
|
||||
click() {
|
||||
try {
|
||||
mainWindow.webContents.openDevTools();
|
||||
} catch (err) {
|
||||
console.error("Couldn't open dev tools: " + err);
|
||||
}
|
||||
|
||||
},
|
||||
accelerator: 'Shift+CmdOrCtrl+I'
|
||||
accelerator: "Shift+CmdOrCtrl+I"
|
||||
},
|
||||
{ type: 'separator' },
|
||||
{ role: 'togglefullscreen' }
|
||||
{ type: "separator" },
|
||||
{ role: "togglefullscreen" }
|
||||
]
|
||||
},
|
||||
{
|
||||
label: "Timelines",
|
||||
submenu: [
|
||||
{
|
||||
label: 'Home',
|
||||
label: "Home",
|
||||
accelerator: "CmdOrCtrl+0",
|
||||
click() {
|
||||
safelyGoTo("hyperspace://hyperspace/app/#/home")
|
||||
safelyGoTo("hyperspace://hyperspace/app/#/home");
|
||||
}
|
||||
},
|
||||
{
|
||||
label: 'Local',
|
||||
label: "Local",
|
||||
accelerator: "CmdOrCtrl+1",
|
||||
click() {
|
||||
safelyGoTo("hyperspace://hyperspace/app/#/local")
|
||||
safelyGoTo("hyperspace://hyperspace/app/#/local");
|
||||
}
|
||||
},
|
||||
{
|
||||
label: 'Public',
|
||||
label: "Public",
|
||||
accelerator: "CmdOrCtrl+2",
|
||||
click() {
|
||||
safelyGoTo("hyperspace://hyperspace/app/#/public")
|
||||
safelyGoTo("hyperspace://hyperspace/app/#/public");
|
||||
}
|
||||
},
|
||||
{
|
||||
label: 'Messages',
|
||||
label: "Messages",
|
||||
accelerator: "CmdOrCtrl+3",
|
||||
click() {
|
||||
safelyGoTo("hyperspace://hyperspace/app/#/messages")
|
||||
safelyGoTo("hyperspace://hyperspace/app/#/messages");
|
||||
}
|
||||
},
|
||||
{ type: 'separator' },
|
||||
{ type: "separator" },
|
||||
{
|
||||
label: 'Activity',
|
||||
accelerator: 'Alt+CmdOrCtrl+A',
|
||||
label: "Activity",
|
||||
accelerator: "Alt+CmdOrCtrl+A",
|
||||
click() {
|
||||
safelyGoTo("hyperspace://hyperspace/app/#/activity")
|
||||
safelyGoTo("hyperspace://hyperspace/app/#/activity");
|
||||
}
|
||||
}
|
||||
]
|
||||
|
|
@ -327,127 +342,138 @@ function createMenubar() {
|
|||
label: "Account",
|
||||
submenu: [
|
||||
{
|
||||
label: 'Notifications',
|
||||
label: "Notifications",
|
||||
accelerator: "Alt+CmdOrCtrl+N",
|
||||
click() {
|
||||
safelyGoTo("hyperspace://hyperspace/app/#/notifications")
|
||||
safelyGoTo(
|
||||
"hyperspace://hyperspace/app/#/notifications"
|
||||
);
|
||||
}
|
||||
},
|
||||
{
|
||||
label: 'Recommendations',
|
||||
label: "Recommendations",
|
||||
accelerator: "Alt+CmdOrCtrl+R",
|
||||
click() {
|
||||
safelyGoTo("hyperspace://hyperspace/app/#/recommended")
|
||||
safelyGoTo("hyperspace://hyperspace/app/#/recommended");
|
||||
}
|
||||
},
|
||||
{ type: 'separator' },
|
||||
{ type: "separator" },
|
||||
{
|
||||
label: 'Edit Profile',
|
||||
label: "Edit Profile",
|
||||
accelerator: "Shift+CmdOrCtrl+P",
|
||||
click() {
|
||||
safelyGoTo("hyperspace://hyperspace/app/#/you")
|
||||
safelyGoTo("hyperspace://hyperspace/app/#/you");
|
||||
}
|
||||
},
|
||||
{
|
||||
label: 'Follow Requests',
|
||||
label: "Follow Requests",
|
||||
accelerator: "Alt+CmdOrCtrl+E",
|
||||
click() {
|
||||
safelyGoTo("hyperspace://hyperspace/app/#/requests")
|
||||
safelyGoTo("hyperspace://hyperspace/app/#/requests");
|
||||
}
|
||||
},
|
||||
{
|
||||
label: 'Blocked Servers',
|
||||
label: "Blocked Servers",
|
||||
accelerator: "Shift+CmdOrCtrl+B",
|
||||
click() {
|
||||
safelyGoTo("hyperspace://hyperspace/app/#/blocked")
|
||||
safelyGoTo("hyperspace://hyperspace/app/#/blocked");
|
||||
}
|
||||
},
|
||||
{ type: 'separator'},
|
||||
{ type: "separator" },
|
||||
{
|
||||
label: 'Switch Accounts...',
|
||||
label: "Switch Accounts...",
|
||||
click() {
|
||||
safelyGoTo("hyperspace://hyperspace/app/#/welcome")
|
||||
safelyGoTo("hyperspace://hyperspace/app/#/welcome");
|
||||
}
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
role: 'window',
|
||||
role: "window",
|
||||
submenu: [
|
||||
{ role: 'minimize' },
|
||||
{ role: 'close' },
|
||||
{ type: 'separator' },
|
||||
{ role: "minimize" },
|
||||
{ role: "close" },
|
||||
{ type: "separator" }
|
||||
]
|
||||
},
|
||||
{
|
||||
role: 'help',
|
||||
role: "help",
|
||||
submenu: [
|
||||
{
|
||||
label: 'Hyperspace Desktop Docs',
|
||||
click () { require('electron').shell.openExternal('https://hyperspace.marquiskurt.net/docs/') }
|
||||
label: "Hyperspace Desktop Docs",
|
||||
click() {
|
||||
require("electron").shell.openExternal(
|
||||
"https://hyperspace.marquiskurt.net/docs/"
|
||||
);
|
||||
}
|
||||
},
|
||||
{
|
||||
label: 'Report a Bug',
|
||||
click () { require('electron').shell.openExternal('https://github.com/hyperspacedev/hyperspace/issues') }
|
||||
label: "Report a Bug",
|
||||
click() {
|
||||
require("electron").shell.openExternal(
|
||||
"https://github.com/hyperspacedev/hyperspace/issues"
|
||||
);
|
||||
}
|
||||
},
|
||||
{ type: 'separator' },
|
||||
{ type: "separator" },
|
||||
{
|
||||
label: 'Acknowledgements',
|
||||
click () { require('electron').shell.openExternal('https://github.com/hyperspacedev/hyperspace/blob/master/patreon.md') }
|
||||
label: "Acknowledgements",
|
||||
click() {
|
||||
require("electron").shell.openExternal(
|
||||
"https://github.com/hyperspacedev/hyperspace/blob/master/patreon.md"
|
||||
);
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
];
|
||||
|
||||
if (process.platform === 'darwin') {
|
||||
if (process.platform === "darwin") {
|
||||
menuBar.unshift({
|
||||
label: app.getName(),
|
||||
submenu: [
|
||||
{
|
||||
label: `About ${app.getName()}`,
|
||||
click() {
|
||||
safelyGoTo("hyperspace://hyperspace/app/#/about")
|
||||
safelyGoTo("hyperspace://hyperspace/app/#/about");
|
||||
}
|
||||
},
|
||||
{ type: 'separator' },
|
||||
{ type: "separator" },
|
||||
{
|
||||
label: "Preferences...",
|
||||
accelerator: 'Cmd+,',
|
||||
accelerator: "Cmd+,",
|
||||
click() {
|
||||
safelyGoTo("hyperspace://hyperspace/app/#/settings");
|
||||
}
|
||||
},
|
||||
{ type: 'separator' },
|
||||
{ role: 'services' },
|
||||
{ type: 'separator' },
|
||||
{ role: 'hide' },
|
||||
{ role: 'hideothers' },
|
||||
{ role: 'unhide' },
|
||||
{ type: 'separator' },
|
||||
{ role: 'quit' }
|
||||
{ type: "separator" },
|
||||
{ role: "services" },
|
||||
{ type: "separator" },
|
||||
{ role: "hide" },
|
||||
{ role: "hideothers" },
|
||||
{ role: "unhide" },
|
||||
{ type: "separator" },
|
||||
{ role: "quit" }
|
||||
]
|
||||
});
|
||||
|
||||
// Edit menu
|
||||
menuBar[2].submenu.push(
|
||||
{ type: 'separator' },
|
||||
{ type: "separator" },
|
||||
{
|
||||
label: 'Speech',
|
||||
submenu: [
|
||||
{ role: 'startspeaking' },
|
||||
{ role: 'stopspeaking' }
|
||||
]
|
||||
label: "Speech",
|
||||
submenu: [{ role: "startspeaking" }, { role: "stopspeaking" }]
|
||||
}
|
||||
);
|
||||
|
||||
// Window menu
|
||||
menuBar[6].submenu = [
|
||||
{ role: 'close' },
|
||||
{ role: 'minimize' },
|
||||
{ role: 'zoom' },
|
||||
{ type: 'separator' },
|
||||
{ role: 'front' }
|
||||
]
|
||||
{ role: "close" },
|
||||
{ role: "minimize" },
|
||||
{ role: "zoom" },
|
||||
{ type: "separator" },
|
||||
{ role: "front" }
|
||||
];
|
||||
}
|
||||
|
||||
// Create the template for the menu and attach it to the application
|
||||
|
|
@ -456,21 +482,21 @@ function createMenubar() {
|
|||
}
|
||||
|
||||
// When the app is ready, create the window and menu bar
|
||||
app.on('ready', () => {
|
||||
app.on("ready", () => {
|
||||
registerProtocol();
|
||||
createWindow();
|
||||
createMenubar();
|
||||
});
|
||||
|
||||
// Standard quit behavior changes for macOS
|
||||
app.on('window-all-closed', () => {
|
||||
app.on("window-all-closed", () => {
|
||||
if (!isDarwin()) {
|
||||
app.quit()
|
||||
app.quit();
|
||||
}
|
||||
});
|
||||
|
||||
// When the app is activated, create the window and menu bar
|
||||
app.on('activate', () => {
|
||||
app.on("activate", () => {
|
||||
if (mainWindow === null) {
|
||||
createWindow();
|
||||
createMenubar();
|
||||
|
|
|
|||
|
|
@ -62,7 +62,8 @@ import { getConfig, getUserDefaultBool } from "../../utilities/settings";
|
|||
import {
|
||||
isDesktopApp,
|
||||
isDarwinApp,
|
||||
getElectronApp
|
||||
getElectronApp,
|
||||
linkablePath
|
||||
} from "../../utilities/desktop";
|
||||
import { Config } from "../../types/Config";
|
||||
import {
|
||||
|
|
@ -326,9 +327,10 @@ export class AppLayout extends Component<any, IAppLayoutState> {
|
|||
searchForQuery(what: string) {
|
||||
what = what.replace(/^#/g, "tag:");
|
||||
// console.log(what);
|
||||
window.location.href = isDesktopApp()
|
||||
? "hyperspace://hyperspace/app/index.html#/search?query=" + what
|
||||
: "/#/search?query=" + what;
|
||||
window.location.href = linkablePath("/#/search?query=" + what);
|
||||
// window.location.href = isDesktopApp()
|
||||
// ? "hyperspace://hyperspace/app/index.html#/search?query=" + what
|
||||
// : "/#/search?query=" + what;
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -45,6 +45,7 @@ import { Account } from "../types/Account";
|
|||
import { Relationship } from "../types/Relationship";
|
||||
import { withSnackbar } from "notistack";
|
||||
import { Dictionary } from "../interfaces/utils";
|
||||
import { linkablePath } from "../utilities/desktop";
|
||||
|
||||
/**
|
||||
* The state interface for the notifications page.
|
||||
|
|
@ -616,7 +617,9 @@ class NotificationsPage extends Component<any, INotificationsPageState> {
|
|||
style={{ textAlign: "center" }}
|
||||
>
|
||||
<Typography>
|
||||
<Link href="/#/settings#sp-notifications">
|
||||
<Link
|
||||
href={linkablePath("/#/settings#sp-notifications")}
|
||||
>
|
||||
Manage notification settings
|
||||
</Link>
|
||||
</Typography>
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@ import PersonAddIcon from "@material-ui/icons/PersonAdd";
|
|||
import { styles } from "./PageLayout.styles";
|
||||
import { LinkableIconButton, LinkableAvatar } from "../interfaces/overrides";
|
||||
import Mastodon from "megalodon";
|
||||
import { parse as parseParams, ParsedQuery } from "query-string";
|
||||
import { parse as parseParams } from "query-string";
|
||||
import { Results } from "../types/Search";
|
||||
import { withSnackbar } from "notistack";
|
||||
import Post from "../components/Post";
|
||||
|
|
@ -84,35 +84,23 @@ class SearchPage extends Component<any, ISearchPageState> {
|
|||
}
|
||||
}
|
||||
|
||||
runQueryCheck(newLocation?: string): ParsedQuery {
|
||||
let searchParams = "";
|
||||
if (newLocation !== undefined && typeof newLocation === "string") {
|
||||
searchParams = newLocation.replace("#/search", "");
|
||||
} else {
|
||||
searchParams = this.props.location.hash.replace("#/search", "");
|
||||
}
|
||||
return parseParams(searchParams);
|
||||
}
|
||||
|
||||
getQueryAndType(props: any) {
|
||||
let newSearch = this.runQueryCheck(props.location);
|
||||
let query: string | string[];
|
||||
const { search }: { search: string } = props.location;
|
||||
let newSearch = parseParams(search);
|
||||
let query: string | string[] = "";
|
||||
let type;
|
||||
|
||||
if (newSearch.query) {
|
||||
if (newSearch.query.toString().startsWith("tag:")) {
|
||||
if (search.includes("tag:")) {
|
||||
type = "tag";
|
||||
query = newSearch.query.toString().replace("tag:", "");
|
||||
} else {
|
||||
query = newSearch.query;
|
||||
}
|
||||
} else {
|
||||
query = "";
|
||||
query = newSearch.query.toString().replace("tag:", "");
|
||||
}
|
||||
|
||||
if (newSearch.type && newSearch.type !== undefined) {
|
||||
type = newSearch.type;
|
||||
}
|
||||
|
||||
return {
|
||||
query: query,
|
||||
type: type
|
||||
|
|
@ -155,14 +143,11 @@ class SearchPage extends Component<any, ISearchPageState> {
|
|||
let tagResults: [Status] = resp.data;
|
||||
this.setState({
|
||||
tagResults,
|
||||
viewDidLoad: true,
|
||||
viewIsLoading: false
|
||||
viewDidLoad: true
|
||||
});
|
||||
// console.log(this.state.tagResults);
|
||||
})
|
||||
.catch((err: Error) => {
|
||||
this.setState({
|
||||
viewIsLoading: false,
|
||||
viewDidError: true,
|
||||
viewDidErrorCode: err.message
|
||||
});
|
||||
|
|
@ -171,6 +156,9 @@ class SearchPage extends Component<any, ISearchPageState> {
|
|||
`Couldn't search for posts with tag ${this.state.query}: ${err.name}`,
|
||||
{ variant: "error" }
|
||||
);
|
||||
})
|
||||
.finally(() => {
|
||||
this.setState({ viewIsLoading: false });
|
||||
});
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -597,7 +597,6 @@ class SettingsPage extends Component<any, ISettingsState> {
|
|||
label={theme.name}
|
||||
/>
|
||||
))}
|
||||
))}
|
||||
</RadioGroup>
|
||||
</Grid>
|
||||
<Grid
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@ export function isDarkMode() {
|
|||
// Lift window to an ElectronWindow and add use require()
|
||||
const eWin = window as ElectronWindow;
|
||||
const { remote } = eWin.require("electron");
|
||||
return remote.systemPreferences.isDarkMode();
|
||||
return remote.nativeTheme.shouldUseDarkColors;
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -56,3 +56,11 @@ export function getElectronApp() {
|
|||
const { remote } = eWin.require("electron");
|
||||
return remote.app;
|
||||
}
|
||||
|
||||
/**
|
||||
* Get the linkable version of a path for the web and desktop.
|
||||
* @param path The path to make a linkable version of
|
||||
*/
|
||||
export function linkablePath(path: string): string {
|
||||
return isDesktopApp() ? "/app" + path : path;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue