Skip to content

Commit 84c2944

Browse files
committed
🔀 Merge branch 'develop' into feature/lazy-loading
Also apply some fixes.
2 parents f5f77d3 + dcf6cdd commit 84c2944

50 files changed

Lines changed: 2271 additions & 1361 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.babelrc

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"sourceType": "module"
3+
}

.travis.yml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
language: node_js
2-
node_js: "8"
2+
node_js:
3+
- "8"
4+
- "10"
5+
6+
matrix:
7+
allow_failures:
8+
- node_js: 10
39

410
before_script:
511
- yarn global add greenkeeper-lockfile@1

database.rules.bolt

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ type PlaybackState {
4040
}
4141

4242
type PartySettings {
43+
allow_anonymous_voters: Boolean,
4344
allow_explicit_tracks: Boolean,
4445
allow_multi_track_add: Boolean,
4546
}
@@ -85,7 +86,12 @@ path /votes_by_user/{partyId}/{userId}/{trackId} is VotesPermissions {
8586
}
8687

8788
type VotesPermissions {
88-
write() { isCurrentUser(userId) }
89+
write() {
90+
isCurrentUser(userId) &&
91+
(root.parties[partyId].settings == null ||
92+
root.parties[partyId].settings.allow_anonymous_voters ||
93+
auth.provider != "anonymous")
94+
}
8995
validate() { partyExists(partyId) }
9096
}
9197

functions/index.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,5 @@ firebase.initializeApp({
1010
credential: firebase.credential.cert(serviceAccount),
1111
});
1212

13-
export * from './lib/pin-top-track';
1413
export * from './lib/spotify-auth';
1514
export * from './lib/vote-processor';

functions/lib/pin-top-track.ts

Lines changed: 0 additions & 34 deletions
This file was deleted.

0 commit comments

Comments
 (0)