Merge pull request #3307 from withspectrum/2.4.8

2.4.8

Author: brianlovin

hyperion/index.js

@@ -154,7 +154,10 @@ if (process.env.NODE_ENV === 'development') {
 
 app.get('*', (req: express$Request, res, next) => {
   // Electron requests should only be client-side rendered
-  if (req.headers['user-agent'].indexOf('Electron') > -1) {
+  if (
+    req.headers['user-agent'] &&
+    req.headers['user-agent'].indexOf('Electron') > -1
+  ) {
     return res.sendFile(path.resolve(__dirname, '../build/index.html'));
   }
   next();

package.json

@@ -1,6 +1,6 @@
 {
   "name": "Spectrum",
-  "version": "2.4.7",
+  "version": "2.4.8",
   "license": "BSD-3-Clause",
   "devDependencies": {
     "babel-cli": "^6.24.1",

shared/middlewares/thread-param.js

@@ -2,7 +2,7 @@
 
 const threadParamRedirect = (req, res, next) => {
   // Redirect /?t=asdf123 if the user isn't logged in
-  if (!req.user && req.query.t) {
+  if (req.query.t) {
     res.redirect(`/thread/${req.query.t}`);
     // Redirect /anything?thread=asdf123
   } else if (req.query.thread) {

src/components/profile/style.js

@@ -1,3 +1,4 @@
+// @flow
 import styled from 'styled-components';
 import Link from 'src/components/link';
 import {
@@ -261,6 +262,11 @@ export const ProfileCard = styled(Card)`
   }
 `;
 
+export const ThreadProfileCard = styled(ProfileCard)`
+  border-radius: 8px;
+  box-shadow: ${Shadow.low} ${({ theme }) => hexa(theme.text.default, 0.1)};
+`;
+
 export const ProUpgrade = styled.div`
   margin: 16px;
   margin-top: 0;

src/components/profile/thread.js

@@ -5,7 +5,7 @@ import compose from 'recompose/compose';
 import Link from 'src/components/link';
 import { connect } from 'react-redux';
 import { ThreadListItem } from '../listItems';
-import { ProfileCard } from './style';
+import { ThreadProfileCard } from './style';
 import type { GetThreadType } from 'shared/graphql/queries/thread/getThread';
 
 type Props = {
@@ -39,7 +39,7 @@ class ThreadWithData extends React.Component<Props> {
     }
 
     return (
-      <ProfileCard>
+      <ThreadProfileCard>
         <Link
           to={{
             search: `?thread=${thread.id}`,
@@ -53,7 +53,7 @@ class ThreadWithData extends React.Component<Props> {
             }`}
           />
         </Link>
-      </ProfileCard>
+      </ThreadProfileCard>
     );
   }
 }

src/views/community/index.js

@@ -290,6 +290,7 @@ class CommunityView extends React.Component<Props, State> {
                       icon={isMember ? 'checkmark' : null}
                       loading={state.isLoading}
                       dataCy={'join-community-button'}
+                      style={{ marginTop: '16px' }}
                     >
                       {isMember ? 'Member' : `Join ${community.name}`}
                     </LoginButton>

src/views/notifications/components/newMessageNotification.js

@@ -31,7 +31,11 @@ export const NewMessageNotification = ({ notification, currentUser }) => {
   const date = parseNotificationDate(notification.modifiedAt);
   const context = parseContext(notification.context, currentUser);
   const unsortedMessages = notification.entities.map(notif => notif.payload);
-  const messages = sortAndGroupNotificationMessages(unsortedMessages);
+  let messages = sortAndGroupNotificationMessages(unsortedMessages);
+
+  if (messages.length > 3) {
+    messages = messages.splice(0, messages.length - 3);
+  }
 
   return (
     <NotificationCard isSeen={notification.isSeen}>

src/views/notifications/style.js

@@ -23,6 +23,8 @@ export const NotificationCard = styled(Card)`
   padding-bottom: 24px;
   overflow: hidden;
   transition: ${Transition.hover.off};
+  border-radius: 8px;
+  box-shadow: ${Shadow.low} ${({ theme }) => hexa(theme.text.default, 0.1)};
 
   &:hover {
     transition: none;
@@ -34,6 +36,8 @@ export const SegmentedNotificationCard = styled(Card)`
   padding: 0;
   padding-top: 16px;
   transition: ${Transition.hover.off};
+  border-radius: 8px;
+  box-shadow: ${Shadow.low} ${({ theme }) => hexa(theme.text.default, 0.1)};
 
   &:hover {
     transition: none;
@@ -259,6 +263,8 @@ export const RequestCard = styled(Card)`
   align-items: center;
   justify-content: space-between;
   padding: 16px 16px 16px 24px;
+  border-radius: 8px;
+  box-shadow: ${Shadow.low} ${({ theme }) => hexa(theme.text.default, 0.1)};
 
   > p {
     font-weight: 700;

src/views/thread/components/actionBar.js

@@ -385,6 +385,37 @@ class ActionBar extends React.Component<Props, State> {
                 </Clipboard>
               </ShareButtons>
             )}
+            {thread.channel.isPrivate && (
+              <ShareButtons>
+                <Clipboard
+                  style={{ background: 'none' }}
+                  data-clipboard-text={`https://spectrum.chat/thread/${
+                    thread.id
+                  }`}
+                  onSuccess={() =>
+                    this.props.dispatch(
+                      addToastWithTimeout('success', 'Copied to clipboard')
+                    )
+                  }
+                >
+                  <ShareButton
+                    tipText={'Copy link'}
+                    tipLocation={'top-left'}
+                    data-cy="thread-copy-link-button"
+                  >
+                    <a>
+                      <Icon
+                        glyph={'link'}
+                        size={24}
+                        onClick={() =>
+                          track(events.THREAD_SHARED, { method: 'link' })
+                        }
+                      />
+                    </a>
+                  </ShareButton>
+                </Clipboard>
+              </ShareButtons>
+            )}
           </div>
 
           <div style={{ display: 'flex' }}>