Skip to content
This repository was archived by the owner on Oct 11, 2022. It is now read-only.

Commit e15a965

Browse files
brianlovinbrianlovin
authored
Merge pull request #4484 from withspectrum/2.5.3
2.5.3
2 parents e3a852d + f8737dc commit e15a965

File tree

11 files changed

+30
-37
lines changed

11 files changed

+30
-37
lines changed

‎api/models/thread.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -325,7 +325,7 @@ export const getViewableParticipantThreadsByUser = async (
325325
getParticipantCommunityIds,
326326
]);
327327

328-
const participantThreadIds = participantChannelIds.map(c => c.threadId);
328+
const participantThreadIds = participantChannelIds.map(c => c && c.threadId);
329329
const distinctParticipantChannelIds = participantChannelIds
330330
.map(c => c.channelId)
331331
.filter((x, i, a) => a.indexOf(x) === i);

‎api/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@
7474
"lodash.intersection": "^4.4.0",
7575
"longjohn": "^0.2.12",
7676
"markdown-draft-js": "^0.6.3",
77-
"moment": "^2.22.2",
77+
"moment": "^2.23.0",
7878
"node-env-file": "^0.1.8",
7979
"node-localstorage": "^1.3.1",
8080
"now-env": "^3.1.0",

‎api/queries/directMessageThread/participants.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@ import { signUser } from 'shared/imgix';
55

66
export default async ({ id }: { id: string }, _: any, ctx: GraphQLContext) => {
77
const { loaders, user } = ctx;
8-
if (!user || !user.id) return null;
8+
if (!user || !user.id) return [];
99

1010
const canViewThread = await canViewDMThread(user.id, id, loaders);
1111

12-
if (!canViewThread) return null;
12+
if (!canViewThread) return [];
1313

1414
return loaders.directMessageParticipants.load(id).then(results => {
15-
if (!results || results.length === 0) return null;
15+
if (!results || results.length === 0) return [];
1616
return results.reduction.map(user => {
1717
return signUser(user);
1818
});

‎api/yarn.lock‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6576,11 +6576,16 @@ moment-timezone@^0.5.23:
65766576
dependencies:
65776577
moment ">= 2.9.0"
65786578

6579-
"moment@>= 2.9.0", moment@^2.15.2, moment@^2.20.1, moment@^2.22.2:
6579+
"moment@>= 2.9.0", moment@^2.15.2, moment@^2.20.1:
65806580
version "2.22.2"
65816581
resolved "https://registry.yarnpkg.com/moment/-/moment-2.22.2.tgz#3c257f9839fc0e93ff53149632239eb90783ff66"
65826582
integrity sha1-PCV/mDn8DpP/UxSWMiOeuQeD/2Y=
65836583

6584+
moment@^2.23.0:
6585+
version "2.23.0"
6586+
resolved "https://registry.yarnpkg.com/moment/-/moment-2.23.0.tgz#759ea491ac97d54bac5ad776996e2a58cc1bc225"
6587+
integrity sha512-3IE39bHVqFbWWaPOMHZF98Q9c3LDKGTmypMiTM2QygGXXElkFWIH7GxfmlwmY2vwa+wmNsoYZmG2iusf1ZjJoA==
6588+
65846589
move-concurrently@^1.0.1:
65856590
version "1.0.1"
65866591
resolved "https://registry.yarnpkg.com/move-concurrently/-/move-concurrently-1.0.1.tgz#be2c005fda32e0b29af1f05d7c4b33214c701f92"

‎desktop/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@
1818
"electron-window-state": "^5.0.3"
1919
},
2020
"devDependencies": {
21-
"electron": "^3.0.11",
21+
"electron": "^3.0.12",
2222
"electron-builder": "^20.38.3",
23-
"nodemon": "^1.18.8",
23+
"nodemon": "^1.18.9",
2424
"rimraf": "^2.6.2"
2525
},
2626
"scripts": {

‎desktop/yarn.lock‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -823,10 +823,10 @@ electron-window-state@^5.0.3:
823823
jsonfile "^4.0.0"
824824
mkdirp "^0.5.1"
825825

826-
electron@^3.0.11:
827-
version "3.0.11"
828-
resolved "https://registry.yarnpkg.com/electron/-/electron-3.0.11.tgz#81e350db741fc0f2997ecb2fef5ed085ca42a723"
829-
integrity sha512-galllxAMT3HLbHNR6i5WXrUXzsxzz0D1X6vu3uFMhofU9Wdbxv2w7BAD/BcYTT4c1bu4nZEgXO6AvHXjq0Sksw==
826+
electron@^3.0.12:
827+
version "3.0.12"
828+
resolved "https://registry.yarnpkg.com/electron/-/electron-3.0.12.tgz#7486ff1c60e9c22d8aadaee620695c42c9ddb2ac"
829+
integrity sha512-stvGbqYzWv5qHHtjZZgA7gET3NPGLuxs68IHTrJqsqujQfXGkhMOh8tstpXl86kBdRpzZn7GaDlTWcgeFSmsPw==
830830
dependencies:
831831
"@types/node" "^8.0.24"
832832
electron-download "^4.1.0"
@@ -1919,16 +1919,16 @@ node-pre-gyp@^0.10.0:
19191919
semver "^5.3.0"
19201920
tar "^4"
19211921

1922-
nodemon@^1.18.8:
1923-
version "1.18.8"
1924-
resolved "https://registry.yarnpkg.com/nodemon/-/nodemon-1.18.8.tgz#eb4c0052dc81395bdc503f3c8ae3cba86ca7146a"
1925-
integrity sha512-CgC/JdCf+CT7Z+K6wWaV30t8GU1DPtXpr/6PuXC1/LboXCmUQNKOaz0AEMjoWDTt2AdHOBFxgv41dyC0i79SbA==
1922+
nodemon@^1.18.9:
1923+
version "1.18.9"
1924+
resolved "https://registry.yarnpkg.com/nodemon/-/nodemon-1.18.9.tgz#90b467efd3b3c81b9453380aeb2a2cba535d0ead"
1925+
integrity sha512-oj/eEVTEI47pzYAjGkpcNw0xYwTl4XSTUQv2NPQI6PpN3b75PhpuYk3Vb3U80xHCyM2Jm+1j68ULHXl4OR3Afw==
19261926
dependencies:
19271927
chokidar "^2.0.4"
19281928
debug "^3.1.0"
19291929
ignore-by-default "^1.0.1"
19301930
minimatch "^3.0.4"
1931-
pstree.remy "^1.1.3"
1931+
pstree.remy "^1.1.6"
19321932
semver "^5.5.0"
19331933
supports-color "^5.2.0"
19341934
touch "^3.1.0"
@@ -2285,10 +2285,10 @@ psl@^1.1.24:
22852285
resolved "https://registry.yarnpkg.com/psl/-/psl-1.1.29.tgz#60f580d360170bb722a797cc704411e6da850c67"
22862286
integrity sha512-AeUmQ0oLN02flVHXWh9sSJF7mcdFq0ppid/JkErufc3hGIV/AMa8Fo9VgDo/cT2jFdOWoFvHp90qqBH54W+gjQ==
22872287

2288-
pstree.remy@^1.1.3:
2289-
version "1.1.4"
2290-
resolved "https://registry.yarnpkg.com/pstree.remy/-/pstree.remy-1.1.4.tgz#a03d5dbc06ba639fb6dd4874644c4bad9882ec21"
2291-
integrity sha512-3kSyTN/iTJMxtL87idnFgTyOp2vQ6B/49QcHUO26kh2M2qahlUivFI1zWJ9FRFPoB+KgcP820JMOuIhkBJAP3Q==
2288+
pstree.remy@^1.1.6:
2289+
version "1.1.6"
2290+
resolved "https://registry.yarnpkg.com/pstree.remy/-/pstree.remy-1.1.6.tgz#73a55aad9e2d95814927131fbf4dc1b62d259f47"
2291+
integrity sha512-NdF35+QsqD7EgNEI5mkI/X+UwaxVEbQaz9f4IooEmMUv6ZPmlTQYGjBPJGgrlzNdjSvIy4MWMg6Q6vCgBO2K+w==
22922292

22932293
punycode@^1.4.1:
22942294
version "1.4.1"

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "Spectrum",
3-
"version": "2.5.2",
3+
"version": "2.5.3",
44
"license": "BSD-3-Clause",
55
"devDependencies": {
66
"@babel/preset-flow": "^7.0.0",

‎shared/clients/group-messages.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ export const sortAndGroupMessages = (messages: Array<Output>) => {
5959
*/
6060
const c = new Date(current.timestamp).getTime();
6161
const p = new Date(previous.timestamp).getTime();
62-
return c > p + 21600000;
62+
return c > p + 3600000; // one hour;
6363
};
6464

6565
// if we are evaulating a bubble from the same user

‎src/components/fullscreenView/style.js‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ export const FullscreenViewContainer = styled.div`
1616
align-items: center;
1717
justify-content: flex-start;
1818
flex-direction: column;
19-
align-items: center;
2019
z-index: ${zIndex.fullscreen};
2120
overflow-y: scroll;
2221
-webkit-transform: translate3d(0, 0, 0);

‎src/components/withCurrentUser/index.js‎

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -54,21 +54,10 @@ export const withCurrentUser = (
5454
return (
5555
<CurrentUser>
5656
{({ currentUser, isLoading }) => {
57-
if (!currentUser) {
58-
return (
59-
<Component
60-
{...remainingProps}
61-
currentUser={null}
62-
isLoadingCurrentUser={isLoading}
63-
ref={wrappedComponentRef}
64-
/>
65-
);
66-
}
67-
6857
return (
6958
<Component
7059
{...remainingProps}
71-
currentUser={currentUser}
60+
currentUser={currentUser ? currentUser : null}
7261
isLoadingCurrentUser={isLoading}
7362
ref={wrappedComponentRef}
7463
/>

0 commit comments

Comments
 (0)