Skip to content

Commit

Permalink
🔀 Merge branch 'develop' into feature/lazy-loading
Browse files Browse the repository at this point in the history
Also apply some fixes.
  • Loading branch information
NeoLegends committed May 26, 2018
2 parents f5f77d3 + dcf6cdd commit 84c2944
Show file tree
Hide file tree
Showing 50 changed files with 2,271 additions and 1,361 deletions.
3 changes: 3 additions & 0 deletions .babelrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"sourceType": "module"
}
8 changes: 7 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
language: node_js
node_js: "8"
node_js:
- "8"
- "10"

matrix:
allow_failures:
- node_js: 10

before_script:
- yarn global add greenkeeper-lockfile@1
Expand Down
8 changes: 7 additions & 1 deletion database.rules.bolt
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ type PlaybackState {
}

type PartySettings {
allow_anonymous_voters: Boolean,
allow_explicit_tracks: Boolean,
allow_multi_track_add: Boolean,
}
Expand Down Expand Up @@ -85,7 +86,12 @@ path /votes_by_user/{partyId}/{userId}/{trackId} is VotesPermissions {
}

type VotesPermissions {
write() { isCurrentUser(userId) }
write() {
isCurrentUser(userId) &&
(root.parties[partyId].settings == null ||
root.parties[partyId].settings.allow_anonymous_voters ||
auth.provider != "anonymous")
}
validate() { partyExists(partyId) }
}

Expand Down
1 change: 0 additions & 1 deletion functions/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,5 @@ firebase.initializeApp({
credential: firebase.credential.cert(serviceAccount),
});

export * from './lib/pin-top-track';
export * from './lib/spotify-auth';
export * from './lib/vote-processor';
34 changes: 0 additions & 34 deletions functions/lib/pin-top-track.ts

This file was deleted.

Loading

0 comments on commit 84c2944

Please sign in to comment.