소스 검색

Renamed private room to community room/station.

KrisVos130 9 년 전
부모
커밋
532bd4d578

+ 28 - 28
app/client/scripts/events.js

@@ -1632,10 +1632,10 @@ Template.room.events({
     }
 });
 
-Template.privateRoom.events({
+Template.communityStation.events({
     "click #delete_room": function() {
-        var name = Session.get("privateRoomName");
-        Meteor.call("deletePrivateRoom", name, function(err) {
+        var name = Session.get("CommunityStationName");
+        Meteor.call("deleteCommunityStation", name, function(err) {
             if (err) {
                 console.log(err);
                 var $toastContent = $('<span><strong>Room not deleted.</strong> ' + err.reason + '</span>');
@@ -1648,13 +1648,13 @@ Template.privateRoom.events({
         $("#edit_room_modal").closeModal();
     },
     "click #save_edit_room_changes": function() {
-        var name = Session.get("privateRoomName");
+        var name = Session.get("CommunityStationName");
         var display = $("#edit_room_display").val();
         var desc = $("#edit_room_description").val();
         var privacy = $("#edit_room_privacy").val();
-        var room = PrivateRooms.findOne({name: name});
+        var room = CommunityStations.findOne({name: name});
         if (desc !== room.roomDesc) {
-            Meteor.call("changePrivateRoomDescription", name, desc, function (err) {
+            Meteor.call("changeCommunityStationDescription", name, desc, function (err) {
                 if (err) {
                     var $toastContent = $('<span><strong>Description not changed.</strong> ' + err.reason + '</span>');
                     Materialize.toast($toastContent, 2000);
@@ -1665,7 +1665,7 @@ Template.privateRoom.events({
             });
         }
         if (display !== room.displayName) {
-            Meteor.call("changePrivateRoomDisplayName", name, display, function (err) {
+            Meteor.call("changeCommunityStationDisplayName", name, display, function (err) {
                 if (err) {
                     var $toastContent = $('<span><strong>Display Name not changed.</strong> ' + err.reason + '</span>');
                     Materialize.toast($toastContent, 2000);
@@ -1676,7 +1676,7 @@ Template.privateRoom.events({
             });
         }
         if (privacy !== room.privacy) {
-            Meteor.call("changePrivateRoomPrivacy", name, privacy, function (err) {
+            Meteor.call("changeCommunityStationPrivacy", name, privacy, function (err) {
                 if (err) {
                     var $toastContent = $('<span><strong>Privacy not changed.</strong> ' + err.reason + '</span>');
                     Materialize.toast($toastContent, 2000);
@@ -1700,7 +1700,7 @@ Template.privateRoom.events({
     },
     "click #sync": function () {
         if (Session.get("currentSong") !== undefined) {
-            var room = PrivateRooms.findOne({name: Session.get("privateRoomName")});
+            var room = CommunityStations.findOne({name: Session.get("CommunityStationName")});
             if (room !== undefined) {
                 var timeIn = Date.now() - Session.get("currentSong").started - room.timePaused;
                 if (YTPlayer !== undefined) {
@@ -1739,7 +1739,7 @@ Template.privateRoom.events({
     "click #add-allowed-submit": function (e) {
         if(Meteor.userId()){
             e.preventDefault();
-            Meteor.call("addAllowedToPrivateRoom", Session.get("privateRoomName"), $("#add-allowed").val(), function(err) {
+            Meteor.call("addAllowedToCommunityStation", Session.get("CommunityStationName"), $("#add-allowed").val(), function(err) {
                 if (err) {
                     console.log(err);
                     var $toastContent = $('<span><strong>User not added.</strong> ' + err.reason + '</span>');
@@ -1761,7 +1761,7 @@ Template.privateRoom.events({
         }
     },
     "click #vote-skip": function () {
-        Meteor.call("votePrivateSkip", Session.get("privateRoomName"), function (err, res) {
+        Meteor.call("votePrivateSkip", Session.get("CommunityStationName"), function (err, res) {
             $("#vote-skip").addClass("disabled");
             if(err){
                 var $toastContent = $('<span><strong>Vote not submitted.</strong> ' + err.reason + '</span>');
@@ -1780,7 +1780,7 @@ Template.privateRoom.events({
         }
     },
     "click #play": function () {
-        Meteor.call("resumePrivateRoom", Session.get("privateRoomName"), function(err) {
+        Meteor.call("resumeCommunityStation", Session.get("CommunityStationName"), function(err) {
             if (err) {
                 console.log(err);
                 var $toastContent = $('<span><strong>Room not played.</strong> ' + err.reason + '</span>');
@@ -1792,7 +1792,7 @@ Template.privateRoom.events({
         });
     },
     "click #pause": function () {
-        Meteor.call("pausePrivateRoom", Session.get("privateRoomName"), function(err) {
+        Meteor.call("pauseCommunityStation", Session.get("CommunityStationName"), function(err) {
             if (err) {
                 console.log(err);
                 var $toastContent = $('<span><strong>Room not paused.</strong> ' + err.reason + '</span>');
@@ -1804,7 +1804,7 @@ Template.privateRoom.events({
         });
     },
     "click #skip": function () {
-        Meteor.call("skipPrivateSong", Session.get("privateRoomName"), function(err) {
+        Meteor.call("skipPrivateSong", Session.get("CommunityStationName"), function(err) {
             if (err) {
                 console.log(err);
                 var $toastContent = $('<span><strong>Room not skipped.</strong> ' + err.reason + '</span>');
@@ -1825,7 +1825,7 @@ Template.privateRoom.events({
         if (user === undefined) {
             user = $(e.target).parent().data("user");
         }
-        Meteor.call("removeAllowedFromPrivateRoom", Session.get("privateRoomName"), user, function(err) {
+        Meteor.call("removeAllowedFromCommunityStation", Session.get("CommunityStationName"), user, function(err) {
             if (err) {
                 console.log(err);
                 var $toastContent = $('<span><strong>User not removed.</strong> ' + err.reason + '</span>');
@@ -1900,7 +1900,7 @@ Template.privateRoom.events({
                 var $toastContent = $('<span><strong>Playlist not created.</strong> ' + err.reason + '</span>');
                 Materialize.toast($toastContent, 2000);
             } else {
-                var $toastContent = $('<span><strong>playlist created.</strong></span>');
+                var $toastContent = $('<span><strong>Playlist created.</strong></span>');
                 Materialize.toast($toastContent, 2000);
             }
         });
@@ -1920,29 +1920,29 @@ Template.privateRoom.events({
         e.preventDefault();
         $("#edit_playlist_modal").closeModal();
         var name = $(e.target).data("playlist");
-        Meteor.call("setPlaylistForPrivateRoom", Session.get("privateRoomName"), name);
+        Meteor.call("setPlaylistForCommunityStation", Session.get("CommunityStationName"), name);
     }
 });
 
 Template.home.events({
-    "click #create_private_room_submit": function () {
-         var name = $("#create_private_room_name").val();
-         var displayName = $("#create_private_room_display_name").val();
-         var description = $("#create_private_room_description").val();
-         Meteor.call("createPrivateRoom", name, displayName, true, description, function(err) {
+    "click #create_community_station_submit": function () {
+         var name = $("#create_community_station_name").val();
+         var displayName = $("#create_community_station_display_name").val();
+         var description = $("#create_community_station_description").val();
+         Meteor.call("createCommunityStation", name, displayName, true, description, function(err) {
              if (err) {
                  console.log(err);
-                 var $toastContent = $('<span><strong>Private room not created.</strong> ' + err.reason + '</span>');
+                 var $toastContent = $('<span><strong>Community room not created.</strong> ' + err.reason + '</span>');
                  Materialize.toast($toastContent, 2000);
              } else {
-                 var $toastContent = $('<span><strong>Private room created.</strong></span>');
+                 var $toastContent = $('<span><strong>Community room created.</strong></span>');
                  Materialize.toast($toastContent, 2000);
              }
          });
-         $("#create_private_room_name").val("");
-         $("#create_private_room_display_name").val("");
-         $("#create_private_room_description").val("");
-        $("#create_private_room").closeModal();
+         $("#create_community_station_name").val("");
+         $("#create_community_station_display_name").val("");
+         $("#create_community_station_description").val("");
+        $("#create_community_station").closeModal();
     }
 });
 // Settings Template

+ 14 - 14
app/client/scripts/helpers.js

@@ -118,7 +118,7 @@ Template.home.helpers({
     },
     currentPrivateSong: function () {
         var name = this.name;
-        var room = PrivateRooms.findOne({name: name});
+        var room = CommunityStations.findOne({name: name});
         if (room !== undefined) {
             return room.currentSong;
         } else {
@@ -127,7 +127,7 @@ Template.home.helpers({
     },
     userPrivateNum: function () {
         var name = this.name;
-        var userNum = PrivateRooms.findOne({name: name}).users;
+        var userNum = CommunityStations.findOne({name: name}).users;
         return userNum;
     }
 });
@@ -549,9 +549,9 @@ Template.room.helpers({
     }
 });
 
-Template.privateRoom.helpers({
-    privateRoomOwnerName: function() {
-        var room = PrivateRooms.findOne({name: Session.get("privateRoomName")});
+Template.communityStation.helpers({
+    communityStationOwnerName: function() {
+        var room = CommunityStations.findOne({name: Session.get("CommunityStationName")});
         if (room !== undefined) {
             return Meteor.users.findOne(room.owner).profile.username;
         } else {
@@ -562,7 +562,7 @@ Template.privateRoom.helpers({
         return PrivatePlaylists.findOne({owner: Meteor.userId(), name: Session.get("editingPlaylistName")});
     },
     isPlaylistSelected: function(roomName, playlistName) {
-        return PrivateRooms.findOne({name: roomName}).playlist === playlistName;
+        return CommunityStations.findOne({name: roomName}).playlist === playlistName;
     },
     globalChat: function () {
         Meteor.setTimeout(function () {
@@ -578,10 +578,10 @@ Template.privateRoom.helpers({
         });
         return messages;
     },
-    privateRoomDisplayName: function () {
+    communityStationDisplayName: function () {
         var parts = location.href.split('/');
         var id = parts.pop().toLowerCase();
-        return PrivateRooms.findOne({name: id}).displayName;
+        return CommunityStations.findOne({name: id}).displayName;
     },
     name: function () {
         var parts = location.href.split('/');
@@ -591,13 +591,13 @@ Template.privateRoom.helpers({
     users: function () {
         var parts = location.href.split('/');
         var id = parts.pop().toLowerCase();
-        return PrivateRooms.findOne({name: id}).userList.length;
+        return CommunityStations.findOne({name: id}).userList.length;
     },
     allowed: function () {
         var parts = location.href.split('/');
         var id = parts.pop().toLowerCase();deploy
         var arr = [];
-        PrivateRooms.findOne({name: id}).allowed.forEach(function(allowed) {
+        CommunityStations.findOne({name: id}).allowed.forEach(function(allowed) {
             arr.push({name: Meteor.users.findOne(allowed).profile.username, id: allowed});
         });
         return arr;
@@ -615,7 +615,7 @@ Template.privateRoom.helpers({
         return Session.get("state") === "paused";
     },
     private: function () {
-        var room = PrivateRooms.findOne({name: Session.get("privateRoomName")});
+        var room = CommunityStations.findOne({name: Session.get("CommunityStationName")});
         if (room !== undefined) {
             return room.private;
         } else {
@@ -629,7 +629,7 @@ Template.privateRoom.helpers({
         return Session.get("currentSong");
     },
     votes: function () {
-        var room = PrivateRooms.findOne({name: Session.get("privateRoomName")});
+        var room = CommunityStations.findOne({name: Session.get("CommunityStationName")});
         if (room !== undefined) {
             return room.votes;
         } else {
@@ -638,7 +638,7 @@ Template.privateRoom.helpers({
     },
     usersInRoom: function() {
         var userList = [];
-        var room = PrivateRooms.findOne({name: Session.get("privateRoomName")});
+        var room = CommunityStations.findOne({name: Session.get("CommunityStationName")});
         if (room !== undefined) {
             var roomUserList = room.userList;
             roomUserList.forEach(function (user) {
@@ -655,7 +655,7 @@ Template.privateRoom.helpers({
         setTimeout(function() {
             Materialize.updateTextFields();
         }, 100);
-        return PrivateRooms.findOne({name: id});
+        return CommunityStations.findOne({name: id});
     }
 });
 

+ 7 - 7
app/client/scripts/main.js

@@ -19,7 +19,7 @@ Deps.autorun(function() {
     Meteor.subscribe("playlists");
     Meteor.subscribe("alerts");
     Meteor.subscribe("rooms");
-    Meteor.subscribe("private_rooms");
+    Meteor.subscribe("community_stations");
     Meteor.subscribe("private_playlists");
     Meteor.subscribe("news");
     Meteor.subscribe("userData", Meteor.userId());
@@ -51,8 +51,8 @@ Handlebars.registerHelper("isModerator", function(argument){
     }
 });
 
-Handlebars.registerHelper("isAllowedInPrivateRoom", function(name){
-    var room = PrivateRooms.findOne({name: name});
+Handlebars.registerHelper("isAllowedInCommunityStation", function(name){
+    var room = CommunityStations.findOne({name: name});
     if (Meteor.user() &&
         Meteor.user().profile &&
         room &&
@@ -63,8 +63,8 @@ Handlebars.registerHelper("isAllowedInPrivateRoom", function(name){
     }
 });
 
-Handlebars.registerHelper("isPrivateRoomOwner", function(name){
-    var room = PrivateRooms.findOne({name: name});
+Handlebars.registerHelper("isCommunityStationOwner", function(name){
+    var room = CommunityStations.findOne({name: name});
     if (Meteor.user() &&
         Meteor.user().profile &&
         room &&
@@ -89,8 +89,8 @@ Handlebars.registerHelper("rooms", function(){
     return Rooms.find({});
 });
 
-Handlebars.registerHelper("privateRooms", function(){
-    return PrivateRooms.find({});
+Handlebars.registerHelper("communityStations", function(){
+    return CommunityStations.find({});
 });
 
 

+ 7 - 7
app/client/scripts/onCreated.js

@@ -389,7 +389,7 @@ Template.room.onCreated(function () {
     }, 1000);
 });
 
-Template.privateRoom.onCreated(function () {
+Template.communityStation.onCreated(function () {
     Chat.after.find(function(userId, selector) {
         if (selector.type === "global") {
             if (!$("#global-chat-tab").hasClass("active")) {
@@ -418,9 +418,9 @@ Template.privateRoom.onCreated(function () {
     var currentSongR = undefined;
 
     function getTimeElapsed() {
-        var name = Session.get("privateRoomName");
+        var name = Session.get("CommunityStationName");
         if (currentSong !== undefined) {
-            var room = PrivateRooms.findOne({name: name});
+            var room = CommunityStations.findOne({name: name});
             if (room !== undefined) {
                 return Date.now() - currentSong.started - room.timePaused;
             }
@@ -517,18 +517,18 @@ Template.privateRoom.onCreated(function () {
     }
 
     Session.set("loaded", false);
-    Meteor.subscribe("private_rooms", function() {
+    Meteor.subscribe("community_stations", function() {
         var parts = location.href.split('/');
         var id = parts.pop();
         var name = id.toLowerCase();
-        Session.set("privateRoomName", name);
-        if (PrivateRooms.find({name: name}).count() !== 1) {
+        Session.set("CommunityStationName", name);
+        if (CommunityStations.find({name: name}).count() !== 1) {
             window.location = "/";
         } else {
             StationSubscription = Meteor.subscribe("pr_" + name);
             Session.set("loaded", true);
             Session.set("minterval", Meteor.setInterval(function () {
-                var room = PrivateRooms.findOne({name: name});
+                var room = CommunityStations.findOne({name: name});
                 if (room !== undefined) {
                     if (room.state === "paused" || Session.get("pauseVideo")) {
                         Session.set("state", "paused");

+ 2 - 2
app/client/scripts/onRendered.js

@@ -98,7 +98,7 @@ Template.room.onRendered(function() {
     }, 1000)
 });
 
-Template.privateRoom.onRendered(function() {
+Template.communityStation.onRendered(function() {
     if (Session.get("rTimeInterval") !== undefined) {
         Meteor.clearInterval(Session.get("rTimeInterval"))
     }
@@ -106,7 +106,7 @@ Template.privateRoom.onRendered(function() {
         Session.set("time", new Date().getTime());
         var parts = location.href.split('/');
         var id = parts.pop().toLowerCase();
-        if (PrivateRooms.findOne({name: id}) === undefined) {
+        if (CommunityStations.findOne({name: id}) === undefined) {
             location.href = "/";
         }
     }, 10000));

+ 5 - 5
app/client/scripts/routes.js

@@ -185,13 +185,13 @@ Router.route("/u/:user", {
     name: "profile"
 });
 
-Router.route("/private/:name", {
+Router.route("/community/:name", {
     waitOn: function() {
-        return [Meteor.subscribe("isModerator", Meteor.userId()), Meteor.subscribe("isAdmin", Meteor.userId()), Meteor.subscribe("private_rooms")];
+        return [Meteor.subscribe("isModerator", Meteor.userId()), Meteor.subscribe("isAdmin", Meteor.userId()), Meteor.subscribe("community_stations")];
     },
     action: function() {
         var user = Meteor.users.findOne({});
-        var room = PrivateRooms.findOne({name: this.params.name});
+        var room = CommunityStations.findOne({name: this.params.name});
         if (room !== undefined) {
             if (
                 (room.privacy === "private" && user !== undefined && user.profile !== undefined && (user.profile.rank === "admin" || user.profile.rank === "moderator")) ||
@@ -199,7 +199,7 @@ Router.route("/private/:name", {
                 room.privacy !== "private" ||
                 room.owner === Meteor.userId()) {
                 Session.set("type", this.params.type);
-                this.render("privateRoom");
+                this.render("communityStation");
             } else {
                 this.redirect("/");
             }
@@ -207,7 +207,7 @@ Router.route("/private/:name", {
             this.render("404");
         }
     },
-    name: "privateStation"
+    name: "communityStation"
 });
 
 Router.route("/:type", {

+ 7 - 7
app/client/templates/privateRoom.html → app/client/templates/communityStation.html

@@ -1,11 +1,11 @@
-<template name="privateRoom">
+<template name="communityStation">
     <header>
         <nav>
             <div class="nav-wrapper light-blue accent-4">
                 <ul class="left hide-on-med-and-down">
                     <li><a href="/"><i class="material-icons">home</i></a></li>
                     <!--li><a id="vote-skip" class="tooltipped" data-position="bottom" data-delay="50" data-tooltip="Vote to skip this song"><i class="material-icons left">skip_next</i>{{votes}}</a></li-->
-                    {{#if isPrivateRoomOwner name}}
+                    {{#if isCommunityStationOwner name}}
                         {{#if playing}}
                             <li><a id="pause" data-position="bottom" data-delay="50" data-tooltip="Pause this room" data-activates="chat-slide-out" class="tooltipped"><i class="material-icons">pause</i></a></li>
                         {{else}}
@@ -15,7 +15,7 @@
                         <li><a id="edit_room" href="#edit_room_modal" data-position="bottom" data-delay="50" data-tooltip="Edit this room" data-activates="chat-slide-out" class="tooltipped"><i class="material-icons">settings</i></a></li>
                     {{/if}}
                 </ul>
-                <span class="brand-logo center">{{privateRoomDisplayName}} <small>(by {{privateRoomOwnerName}})</small></span>
+                <span class="brand-logo center">{{communityStationDisplayName}} <small>(by {{communityStationOwnerName}})</small></span>
                 <ul class="right hide-on-med-and-down">
                     <!--li><a href="#" data-position="bottom" data-delay="50" data-tooltip="Playlist" id="playlist-slideout" data-activates="playlist-slide-out" class="tooltipped header-collapse"><i class="material-icons">queue_music</i></a></li-->
                     <li><a href="#" data-position="bottom" data-delay="50" data-tooltip="Chat" id="chat-slideout" data-activates="chat-slide-out" class="tooltipped header-collapse"><i class="material-icons">chat</i></a></li>
@@ -107,7 +107,7 @@
                 <li>
                     <a href=/u/{{this.name}} target="_blank">
                         {{this.name}}
-                        {{#if isPrivateRoomOwner name}}
+                        {{#if isCommunityStationOwner name}}
                             <a href="#" class="right remove-allowed" data-user={{this.id}}>
                                 <i class="material-icons" style="line-height: 64px;">remove</i>
                             </a>
@@ -116,7 +116,7 @@
                 </li>
             {{/each}}
         </ul>
-        {{#if isPrivateRoomOwner name}}
+        {{#if isCommunityStationOwner name}}
         <div>
             <div class="row" id="chat-input-div">
                 <div class="input-field col s12">
@@ -137,7 +137,7 @@
                     <a href="#edit_playlist_modal" class="edit-playlist-button" data-playlist={{this.name}}>
                         {{this.displayName}}
                         <a href="#" class="right select-playlist" data-playlist={{this.name}}>
-                            {{#if isPrivateRoomOwner name}}
+                            {{#if isCommunityStationOwner name}}
                                 {{#if isPlaylistSelected name this.name}}
                                     <i class="material-icons" style="line-height: 64px;">check_circle</i>
                                 {{else}}
@@ -170,7 +170,7 @@
                 <select id="edit_room_privacy">
                     <option value="public" {{getSelected 'public' room.privacy}}>Public</option>
                     <option value="unlisted" {{getSelected 'unlisted' room.privacy}}>Unlisted</option>
-                    <option value="private" {{getSelected 'private' room.privacy}}>Private</option>
+                    <option value="community" {{getSelected 'community' room.privacy}}>Private</option>
                 </select>
                 <label>Room Privacy</label>
             </div>

+ 21 - 21
app/client/templates/home.html

@@ -55,20 +55,20 @@
                 {{/each}}
             </div>
             <h3 class="center-align">
-                Private Rooms
+                Community Rooms
                 {{#if currentUser}}
-                    <a href="#create_private_room" id="create_private_room_modal_button"><i class="material-icons">add</i></a>
+                    <a href="#create_community_station" id="create_community_station_modal_button"><i class="material-icons">add</i></a>
                 {{/if}}
             </h3>
             <hr class="center-block" style="width: 99%">
             <div class="row">
-                {{#each room in privateRooms}}
+                {{#each room in communityStations}}
                     {{#if equals room.privacy 'private'}}
-                        {{#if isAllowedInPrivateRoom room.name}}
+                        {{#if isAllowedInCommunityStation room.name}}
                             <div class="col s12 m6 l3">
                                 <div class="card hoverable light-blue white-text">
                                     <div class="card-image waves-effect waves-block waves-light">
-                                        <a href=/private/{{room.name}}>
+                                        <a href=/community/{{room.name}}>
                                         <img src='/notes.png'>
                                         <figcaption class="caption center-align">
                                             <h5>{{room.currentSong.song.title}}</h5>
@@ -80,18 +80,18 @@
                                         <p>{{room.roomDesc}}</p>
                                     </div>
                                     <div class="card-action">
-                                        <a href=/private/{{room.name}} class="white-text">Join Room</a>
+                                        <a href=/community/{{room.name}} class="white-text">Join Room</a>
                                     </div>
                                 </div>
                             </div>
                         {{/if}}
                     {{else}}
                         {{#if equals room.privacy 'unlisted'}}
-                            {{#if isAllowedInPrivateRoom room.name}}
+                            {{#if isAllowedInCommunityStation room.name}}
                                     <div class="col s12 m6 l3">
                                         <div class="card hoverable light-blue white-text">
                                             <div class="card-image waves-effect waves-block waves-light">
-                                                <a href=/private/{{room.name}}>
+                                                <a href=/community/{{room.name}}>
                                                     <img src='/notes.png'>
                                                     <figcaption class="caption center-align">
                                                         <h5>{{room.currentSong.song.title}}</h5>
@@ -103,7 +103,7 @@
                                                 <p>{{room.roomDesc}}</p>
                                             </div>
                                             <div class="card-action">
-                                                <a href=/private/{{room.name}} class="white-text">Join Room</a>
+                                                <a href=/community/{{room.name}} class="white-text">Join Room</a>
                                             </div>
                                         </div>
                                     </div>
@@ -112,7 +112,7 @@
                             <div class="col s12 m6 l3">
                                 <div class="card hoverable">
                                     <div class="card-image waves-effect waves-block waves-light">
-                                        <a href=/private/{{room.name}}>
+                                        <a href=/community/{{room.name}}>
                                             <img src='/notes.png'>
                                             <figcaption class="caption center-align">
                                                 <h5>{{room.currentSong.song.title}}</h5>
@@ -124,7 +124,7 @@
                                         <p>{{room.roomDesc}}</p>
                                     </div>
                                     <div class="card-action">
-                                        <a href=/private/{{room.name}} class="light-blue-text text-accent-4">Join Room</a>
+                                        <a href=/community/{{room.name}} class="light-blue-text text-accent-4">Join Room</a>
                                     </div>
                                 </div>
                             </div>
@@ -136,22 +136,22 @@
     </main>
     {{> footer}}
 
-    <div id="create_private_room" class="modal">
+    <div id="create_community_station" class="modal">
         <div class="modal-content">
-            <h4>Create Modal</h4>
+            <h4>Create Community Room</h4>
             <div class="input-field">
-                <input id="create_private_room_name" type="text">
-                <label for="create_private_room_name">Name</label>
+                <input id="create_community_station_name" type="text">
+                <label for="create_community_station_name">Name</label>
             </div>
             <div class="input-field">
-                <input id="create_private_room_display_name" type="text">
-                <label for="create_private_room_display_name">Display Name</label>
+                <input id="create_community_station_display_name" type="text">
+                <label for="create_community_station_display_name">Display Name</label>
             </div>
             <div class="input-field">
-                <input id="create_private_room_description" type="text">
-                <label for="create_private_room_description">Description</label>
+                <input id="create_community_station_description" type="text">
+                <label for="create_community_station_description">Description</label>
             </div>
-            <button class="btn waves-effect waves-light" id="create_private_room_submit">Create</button>
+            <button class="btn waves-effect waves-light" id="create_community_station_submit">Create</button>
         </div>
         <div class="divider"></div>
         <div class="modal-footer">
@@ -159,7 +159,7 @@
         </div>
     </div>
     <script>
-        $("#create_private_room_modal_button").leanModal({
+        $("#create_community_station_modal_button").leanModal({
             dismissible: true,
             opacity: .5,
             in_duration: 500,

+ 1 - 1
app/lib/collections.js

@@ -1,7 +1,7 @@
 Playlists = new Mongo.Collection("playlists");
 PrivatePlaylists = new Mongo.Collection("private_playlists");
 Rooms = new Mongo.Collection("rooms");
-PrivateRooms = new Mongo.Collection("private_rooms");
+CommunityStations = new Mongo.Collection("community_stations");
 Queues = new Mongo.Collection("queues");
 Reports = new Mongo.Collection("reports");
 Chat = new Mongo.Collection("chat");

+ 2 - 2
app/lib/schemas.js

@@ -275,7 +275,7 @@ Schemas.Room = new SimpleSchema({
     }
 });
 
-Schemas.PrivateRoom = new SimpleSchema({
+Schemas.CommunityStation = new SimpleSchema({
     name: {
         type: String,
         label: "Room Name",
@@ -680,5 +680,5 @@ Reports.attachSchema(Schemas.Report);
 Feedback.attachSchema(Schemas.Feedback);
 Songs.attachSchema(Schemas.FullSong);
 News.attachSchema(Schemas.Article);
-PrivateRooms.attachSchema(Schemas.PrivateRoom);
+CommunityStations.attachSchema(Schemas.CommunityStation);
 PrivatePlaylists.attachSchema(Schemas.PrivatePlaylist);

+ 73 - 73
app/server/server.js

@@ -53,7 +53,7 @@ var default_private_playlist = {
 Alerts.update({active: true}, {$set: {active: false}}, {multi: true});
 
 var stations = [];
-var privateStations = [];
+var communityStations = [];
 var voteNum = 0;
 
 var chars = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890_";
@@ -126,8 +126,8 @@ function getStation(type, cb) {
     });
 }
 
-function getPrivateStation(name, cb) {
-    privateStations.forEach(function (station) {
+function getCommunityStation(name, cb) {
+    communityStations.forEach(function (station) {
         if (station.name === name) {
             cb(station);
             return;
@@ -157,9 +157,9 @@ function createRoom(display, tag, private, desc) {
     }
 }
 
-function createPrivateRoom(name, display, private, desc, owner) {
-    if (PrivateRooms.find({name: name}).count() === 0) {
-        PrivateRooms.insert({
+function createCommunityStation(name, display, private, desc, owner) {
+    if (CommunityStations.find({name: name}).count() === 0) {
+        CommunityStations.insert({
             name: name,
             displayName: display,
             private: private,
@@ -169,11 +169,11 @@ function createPrivateRoom(name, display, private, desc, owner) {
             if (err) {
                 throw err;
             } else {
-                privateStations.push(new PrivateStation(name));
+                communityStations.push(new CommunityStation(name));
             }
         });
     } else {
-        return "Private room with that name already exists";
+        return "Community room with that name already exists";
     }
 }
 
@@ -379,9 +379,9 @@ function Station(type) {
     this.voted = [];
 }
 
-function PrivateStation(name) {
+function CommunityStation(name) {
     var usersObj = {};
-    PrivateRooms.update({name: name}, {$set: {userList: []}});
+    CommunityStations.update({name: name}, {$set: {userList: []}});
     Meteor.publish("pr_" + name, function () {
         var user = Meteor.users.findOne(this.userId);
         if (this.userId !== undefined && user !== undefined && user.profile !== undefined && user.profile.username !== undefined) {
@@ -391,16 +391,16 @@ function PrivateStation(name) {
             } else {
                 usersObj[username]++;
             }
-            PrivateRooms.update({name: name}, {$push: {userList: username}});
+            CommunityStations.update({name: name}, {$push: {userList: username}});
             this.onStop(function () {
                 usersObj[username]--;
-                var room = PrivateRooms.findOne({name: name});
+                var room = CommunityStations.findOne({name: name});
                 if (room !== undefined) {
                     var list = room.userList;
                     var index = list.indexOf(username);
                     if (index >= 0) {
                         list.splice(index, 1);
-                        PrivateRooms.update({name: name}, {$set: {userList: list}});
+                        CommunityStations.update({name: name}, {$set: {userList: list}});
                     }
                 }
             });
@@ -409,7 +409,7 @@ function PrivateStation(name) {
     });
     var self = this;
     var startedAt = Date.now();
-    var _room = PrivateRooms.findOne({name: name});
+    var _room = CommunityStations.findOne({name: name});
     var playlist;
     if (_room !== undefined) {
         playlist = PrivatePlaylists.findOne({name: _room.playlist, owner: _room.owner});
@@ -429,7 +429,7 @@ function PrivateStation(name) {
     if (song === undefined) {
         song = {id: "60ItHLz5WEA", duration: 213, title: "Alan Walker - Faded"};
     }
-    var res = PrivateRooms.update({name: name}, {
+    var res = CommunityStations.update({name: name}, {
         $set: {
             currentSong: {song: song, started: startedAt},
             users: 0
@@ -439,13 +439,13 @@ function PrivateStation(name) {
     this.skipSong = function () {
         self.voted = [];
         voteNum = 0;
-        PrivateRooms.update({name: name}, {$set: {votes: 0}});
+        CommunityStations.update({name: name}, {$set: {votes: 0}});
         playlist = PrivatePlaylists.findOne({name: _room.playlist, owner: _room.owner});
         if (playlist === undefined) {
             playlist = default_private_playlist;
         }
         if (playlist !== undefined && playlist.songs.length === 0) {
-            PrivateRooms.update({name: name}, {$unset: {"playlist": 1}});
+            CommunityStations.update({name: name}, {$unset: {"playlist": 1}});
             playlist = default_private_playlist;
         }
         songs = playlist.songs;
@@ -458,12 +458,12 @@ function PrivateStation(name) {
             currentSong++;
         } else currentSong = 0;
         currentId = songs[currentSong];
-        PrivateRooms.update({name: name}, {$set: {timePaused: 0}});
+        CommunityStations.update({name: name}, {$set: {timePaused: 0}});
         this.songTimer();
-        PrivateRooms.update({name: name}, {$set: {currentSong: {song: songs[currentSong], started: startedAt}}});
+        CommunityStations.update({name: name}, {$set: {currentSong: {song: songs[currentSong], started: startedAt}}});
     };
 
-    PrivateRooms.update({name: name}, {$set: {timePaused: 0}});
+    CommunityStations.update({name: name}, {$set: {timePaused: 0}});
 
     var timer;
     var timerInitialised = false;
@@ -482,12 +482,12 @@ function PrivateStation(name) {
         }
     };
 
-    var state = PrivateRooms.findOne({name: name}).state;
+    var state = CommunityStations.findOne({name: name}).state;
 
     this.pauseRoom = function () {
         if (state !== "paused") {
             timer.pause();
-            PrivateRooms.update({name: name}, {$set: {state: "paused"}});
+            CommunityStations.update({name: name}, {$set: {state: "paused"}});
             state = "paused";
         }
     };
@@ -499,7 +499,7 @@ function PrivateStation(name) {
                 }, songs[currentSong] * 1000);
             }
             timer.resume();
-            PrivateRooms.update({name: name}, {$set: {state: "playing", timePaused: timer.timeWhenPaused()}});
+            CommunityStations.update({name: name}, {$set: {state: "playing", timePaused: timer.timeWhenPaused()}});
             state = "playing";
         }
     };
@@ -511,19 +511,19 @@ function PrivateStation(name) {
     };
     this.name = name;
 
-    var privacy = PrivateRooms.findOne({name: name}).privacy;
+    var privacy = CommunityStations.findOne({name: name}).privacy;
     this.privacy = privacy;
 
     this.setPrivacy = function (privacy) {
         if (self.privacy !== privacy) {
             self.privacy = privacy;
-            return PrivateRooms.update({name: name}, {$set: {"privacy": privacy}});
+            return CommunityStations.update({name: name}, {$set: {"privacy": privacy}});
         }
     };
 
     this.setPlaylist = function (plName) {
         if (PrivatePlaylists.findOne({name: plName, owner: _room.owner}) !== undefined) {
-            PrivateRooms.update({name: name}, {$set: {"playlist": plName}});
+            CommunityStations.update({name: name}, {$set: {"playlist": plName}});
             _room.playlist = plName;
             playlist = PrivatePlaylists.findOne({name: plName, owner: _room.owner});
             songs = playlist.songs;
@@ -534,15 +534,15 @@ function PrivateStation(name) {
 
     this.addAllowed = function (allowed) {
         if (_room.allowed.indexOf(allowed) === -1 && _room.owner !== allowed) {
-            PrivateRooms.update({name: name}, {$push: {allowed: allowed}});
-            _room = PrivateRooms.findOne({name: name});
+            CommunityStations.update({name: name}, {$push: {allowed: allowed}});
+            _room = CommunityStations.findOne({name: name});
         }
     };
 
     this.removeAllowed = function (allowed) {
         if (_room.allowed.indexOf(allowed) !== -1) {
-            PrivateRooms.update({name: name}, {$pull: {allowed: allowed}});
-            _room = PrivateRooms.findOne({name: name});
+            CommunityStations.update({name: name}, {$pull: {allowed: allowed}});
+            _room = CommunityStations.findOne({name: name});
         }
     };
 
@@ -681,9 +681,9 @@ Rooms.find({}).fetch().forEach(function (room) {
     }
 });
 
-PrivateRooms.find({}).fetch().forEach(function (room) {
+CommunityStations.find({}).fetch().forEach(function (room) {
     var name = room.name;
-    privateStations.push(new PrivateStation(name));
+    communityStations.push(new CommunityStation(name));
 });
 
 Accounts.validateNewUser(function (user) {
@@ -759,17 +759,17 @@ Meteor.publish("rooms", function () {
     return Rooms.find({});
 });
 
-Meteor.publish("private_rooms", function () {
+Meteor.publish("community_stations", function () {
     var userId = this.userId;
     if (userId) {
         var user = Meteor.users.findOne(userId);
         if (user.profile.rank === "admin" || user.profile.rank === "moderator") {
-            return PrivateRooms.find({});
+            return CommunityStations.find({});
         } else {
-            return PrivateRooms.find({$or: [{owner: userId}, {privacy: "public"}]});
+            return CommunityStations.find({$or: [{owner: userId}, {privacy: "public"}]});
         }
     } else {
-        return PrivateRooms.find({privacy: "public"});
+        return CommunityStations.find({privacy: "public"});
     }
 });
 
@@ -844,8 +844,8 @@ Meteor.publish("feedback", function(){
     return Feedback.find();
 })
 
-function isPrivateRoomOwner(name) {
-    var room = PrivateRooms.findOne({name: name});
+function isCommunityStationOwner(name) {
+    var room = CommunityStations.findOne({name: name});
     if (Meteor.userId() && room !== undefined && Meteor.userId() === room.owner) {
         return true;
     } else {
@@ -902,34 +902,34 @@ function isMuted() {
 }
 
 Meteor.methods({
-    deletePrivateRoom: function(roomName) {
-        if ((isAdmin() || isPrivateRoomOwner(roomName)) && !isBanned()) {
-            PrivateRooms.remove({name: roomName});
-            getPrivateStation(roomName, function(room) {
+    deleteCommunityStation: function(roomName) {
+        if ((isAdmin() || isCommunityStationOwner(roomName)) && !isBanned()) {
+            CommunityStations.remove({name: roomName});
+            getCommunityStation(roomName, function(room) {
                 room.cancelTimer();
-                delete privateStations[privateStations.indexOf(room)];
+                delete communityStations[communityStations.indexOf(room)];
             });
         } else {
             throw new Meteor.Error(403, "Invalid permissions.");
         }
     },
-    changePrivateRoomDescription: function(roomName, newDescription) {
-        if ((isAdmin() || isPrivateRoomOwner(roomName)) && !isBanned()) {
-            PrivateRooms.update({name: roomName}, {$set: {roomDesc: newDescription}});
+    changeCommunityStationDescription: function(roomName, newDescription) {
+        if ((isAdmin() || isCommunityStationOwner(roomName)) && !isBanned()) {
+            CommunityStations.update({name: roomName}, {$set: {roomDesc: newDescription}});
         } else {
             throw new Meteor.Error(403, "Invalid permissions.");
         }
     },
-    changePrivateRoomDisplayName: function(roomName, newDisplayName) {
-        if ((isAdmin() || isPrivateRoomOwner(roomName)) && !isBanned()) {
-            PrivateRooms.update({name: roomName}, {$set: {displayName: newDisplayName}});
+    changeCommunityStationDisplayName: function(roomName, newDisplayName) {
+        if ((isAdmin() || isCommunityStationOwner(roomName)) && !isBanned()) {
+            CommunityStations.update({name: roomName}, {$set: {displayName: newDisplayName}});
         } else {
             throw new Meteor.Error(403, "Invalid permissions.");
         }
     },
-    changePrivateRoomPrivacy: function(roomName, newPrivacy) {
-        if ((isAdmin() || isPrivateRoomOwner(roomName)) && !isBanned()) {
-            PrivateRooms.update({name: roomName}, {$set: {privacy: newPrivacy}});
+    changeCommunityStationPrivacy: function(roomName, newPrivacy) {
+        if ((isAdmin() || isCommunityStationOwner(roomName)) && !isBanned()) {
+            CommunityStations.update({name: roomName}, {$set: {privacy: newPrivacy}});
         } else {
             throw new Meteor.Error(403, "Invalid permissions.");
         }
@@ -1267,10 +1267,10 @@ Meteor.methods({
     votePrivateSkip: function (name) {
         if (Meteor.userId() && !isBanned()) {
             var user = Meteor.user();
-            getPrivateStation(name, function (station) {
+            getCommunityStation(name, function (station) {
                 if (station.voted.indexOf(user.profile.username) === -1) {
                     station.voted.push(user.profile.username);
-                    PrivateRooms.update({name: name}, {$set: {votes: station.voted.length}});
+                    CommunityStations.update({name: name}, {$set: {votes: station.voted.length}});
                     if (station.voted.length === 3) {
                         station.skipSong();
                     }
@@ -1359,8 +1359,8 @@ Meteor.methods({
         }
     },
     skipPrivateSong: function (name) {
-        if ((isAdmin() || isPrivateRoomOwner(name)) && !isBanned()) {
-            getPrivateStation(name, function (station) {
+        if ((isAdmin() || isCommunityStationOwner(name)) && !isBanned()) {
+            getCommunityStation(name, function (station) {
                 if (station === undefined) {
                     throw new Meteor.Error(404, "Station not found.");
                 } else {
@@ -1369,9 +1369,9 @@ Meteor.methods({
             });
         }
     },
-    pausePrivateRoom: function (name) {
-        if ((isAdmin() || isPrivateRoomOwner(name)) && !isBanned()) {
-            getPrivateStation(name, function (station) {
+    pauseCommunityStation: function (name) {
+        if ((isAdmin() || isCommunityStationOwner(name)) && !isBanned()) {
+            getCommunityStation(name, function (station) {
                 if (station === undefined) {
                     throw new Meteor.Error(403, "Room doesn't exist.");
                 } else {
@@ -1382,9 +1382,9 @@ Meteor.methods({
             throw new Meteor.Error(403, "Invalid permissions.");
         }
     },
-    resumePrivateRoom: function (name) {
-        if ((isAdmin() || isPrivateRoomOwner(name)) && !isBanned()) {
-            getPrivateStation(name, function (station) {
+    resumeCommunityStation: function (name) {
+        if ((isAdmin() || isCommunityStationOwner(name)) && !isBanned()) {
+            getCommunityStation(name, function (station) {
                 if (station === undefined) {
                     throw new Meteor.Error(403, "Room doesn't exist.");
                 } else {
@@ -1395,9 +1395,9 @@ Meteor.methods({
             throw new Meteor.Error(403, "Invalid permissions.");
         }
     },
-    addAllowedToPrivateRoom: function (name, allowed) {
-        if (isPrivateRoomOwner(name) && !isBanned()) {
-            getPrivateStation(name, function (station) {
+    addAllowedToCommunityStation: function (name, allowed) {
+        if (isCommunityStationOwner(name) && !isBanned()) {
+            getCommunityStation(name, function (station) {
                 if (station === undefined) {
                     throw new Meteor.Error(403, "Room doesn't exist.");
                 } else {
@@ -1410,9 +1410,9 @@ Meteor.methods({
             throw new Meteor.Error(403, "Invalid permissions.");
         }
     },
-    removeAllowedFromPrivateRoom: function (name, allowed) {
-        if (isPrivateRoomOwner(name) && !isBanned()) {
-            getPrivateStation(name, function (station) {
+    removeAllowedFromCommunityStation: function (name, allowed) {
+        if (isCommunityStationOwner(name) && !isBanned()) {
+            getCommunityStation(name, function (station) {
                 if (station === undefined) {
                     throw new Meteor.Error(403, "Room doesn't exist.");
                 } else {
@@ -1423,9 +1423,9 @@ Meteor.methods({
             throw new Meteor.Error(403, "Invalid permissions.");
         }
     },
-    setPlaylistForPrivateRoom: function (name, playlist) {
-        if ((isPrivateRoomOwner(name)) && !isBanned()) {
-            getPrivateStation(name, function (station) {
+    setPlaylistForCommunityStation: function (name, playlist) {
+        if ((isCommunityStationOwner(name)) && !isBanned()) {
+            getCommunityStation(name, function (station) {
                 if (station === undefined) {
                     throw new Meteor.Error(403, "Room doesn't exist.");
                 } else {
@@ -1634,10 +1634,10 @@ Meteor.methods({
             throw new Meteor.Error(403, "Invalid permissions.");
         }
     },
-    createPrivateRoom: function (name, display, private, desc) {
+    createCommunityStation: function (name, display, private, desc) {
         if (Meteor.userId() && !isBanned()) {
             name = name.toLowerCase();
-            createPrivateRoom(name, display, private, desc, Meteor.userId());
+            createCommunityStation(name, display, private, desc, Meteor.userId());
         } else {
             throw new Meteor.Error(403, "Invalid permissions.");
         }