Merge pull request #63 from hyperspacedev/beta5

1.0.0beta5 (Final check)

README.md

@@ -87,6 +87,6 @@ The built files will be available under `dist` that can be uploaded to your app
 
 Contrubition guidelines are available in the [contributing file](.github/contributing.md) and when you make an issue/pull request. Additionally, you can access our [Code of Conduct](.github/code_of_conduct.md).
 
-If you want to aid the project in other ways, consider supporting the project on [Patreon](https://patreon.com/marquiskurt).
+If you want to aid the project in other ways, consider supporting the project on [Patreon](https://patreon.com/marquiskurt). You can also [view all of our contributors](patreon.md) that help make Hyperspace possible.
 
 If you have Matrix, you can join the Hyperspace community ([+hyperspace-masto:matrix.org](https://matrix.to/#/+hyperspace-masto:matrix.org)).

package.json

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

patreon.md

@@ -0,0 +1,7 @@
+# Patreon Contributors List
+
+Hyperspace has been made possible by the efforts of the Hyperspace development team and these amazing contributors on Patreon:
+
+- LucasAzazer
+
+Thanks for your continued support in helping us create the fluffiest client for the fediverse!

public/config.json

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

public/electron.js

@@ -307,4 +307,4 @@ app.on('activate', () => {
         createWindow();
         createMenubar();
     }
-});
+});

src/components/AppLayout/AppLayout.tsx

@@ -21,7 +21,7 @@ import { Notification } from '../../types/Notification';
 import {sendNotificationRequest} from '../../utilities/notifications';
 import {withSnackbar} from 'notistack';
 import { getConfig, getUserDefaultBool } from '../../utilities/settings';
-import { isDarwinApp } from '../../utilities/desktop';
+import { isDesktopApp, isDarwinApp } from '../../utilities/desktop';
 import { Config } from '../../types/Config';
 
 interface IAppLayoutState {
@@ -84,6 +84,7 @@ export class AppLayout extends Component<any, IAppLayoutState> {
         })
 
         this.streamNotifications()
+        
       }
 
       streamNotifications() {
@@ -153,7 +154,7 @@ export class AppLayout extends Component<any, IAppLayoutState> {
       }
 
       searchForQuery(what: string) {
-        window.location.href = "/#/search?query=" + what;
+        window.location.href = isDesktopApp()? "hyperspace://hyperspace/app/index.html#/search?query=" + what: "/#/search?query=" + what;
         window.location.reload;
       }
 
@@ -408,4 +409,4 @@ export class AppLayout extends Component<any, IAppLayoutState> {
   }
 }
 
-export default withStyles(styles)(withSnackbar(AppLayout));
+export default withStyles(styles)(withSnackbar(AppLayout));

src/components/Post/Post.tsx

@@ -151,10 +151,15 @@ export class Post extends React.Component<any, IPostState> {
                             <CardActionArea href={status.card.url} target="_blank" rel="noreferrer">
                                 <CardContent>
                                     <Typography gutterBottom variant="h6" component="h2">{status.card.title}</Typography>
-                                    <Typography>{status.card.description || "No description provided. Click with caution."}</Typography>
+                                    <Typography>
+                                        {
+                                            status.card.description.slice(0, 500) + (status.card.description.length > 500? "...": "") 
+                                            || "No description provided. Click with caution."
+                                        }
+                                    </Typography>
                                 </CardContent>
                                 {
-                                    status.card.image?
+                                    status.card.image && status.media_attachments.length <= 0?
                                     <CardMedia className={classes.postMedia} image={status.card.image}/>: <span/>
                                 }
                                 <CardContent>