Skip to content

Commit fc6933b

Browse files
committed
See who added and what was added (#84)
Utilizes get title and user var to alert the room who added what and who added it! Beginning of creating a new system for notify alerts for future alerts. See notify.js file.
1 parent d0791fd commit fc6933b

File tree

5 files changed

+76
-26
lines changed

5 files changed

+76
-26
lines changed

index.html

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -353,6 +353,7 @@ <h2>About Vynchronize</h2>
353353
var socket = io.connect();
354354
var roomnum = 1
355355
var id = "M7lc1UVf-VE"
356+
var username = ""
356357

357358
// Chat stuff
358359
$(function() {
@@ -446,6 +447,7 @@ <h2>About Vynchronize</h2>
446447
var noname2 = document.getElementById('missinginfo2')
447448
noname2.innerHTML = "Please enter a room ID without symbols or leading/trailing whitespace!"
448449
} else {
450+
username = $username.val()
449451
socket.emit('new user', $username.val(), function(data) {
450452
if (data) {
451453
$userFormArea.hide();
@@ -627,6 +629,7 @@ <h2>About Vynchronize</h2>
627629
<script src="js/player.js"></script>
628630
<script src="js/host.js"></script>
629631
<script src="js/events.js"></script>
632+
<script src="js/notify.js"></script>
630633

631634
<!-- Youtube -->
632635
<script src="js/yt.js"></script>

js/notify.js

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
// Enqueue Notify (0)
2+
socket.on('enqueueNotify', function(data) {
3+
console.log("Enqueue Notify Alert")
4+
var title = data.title
5+
var user = data.user
6+
// Generate notify alert
7+
$.notify({
8+
title: '<strong>' + user + '</strong>',
9+
icon: 'fas fa-plus',
10+
message: 'added ' + title + ' to the queue'
11+
}, {
12+
type: 'info',
13+
delay: 800,
14+
animate: {
15+
enter: 'animated fadeInUp',
16+
exit: 'animated fadeOutRight'
17+
},
18+
placement: {
19+
from: "bottom",
20+
align: "right"
21+
},
22+
offset: 20,
23+
spacing: 10,
24+
z_index: 1031,
25+
})
26+
})

js/sync.js

Lines changed: 5 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ function getTime() {
102102
return player.getCurrentTime();
103103
break;
104104
case 1:
105-
return dailyPlayer.currentTime;
105+
return dailyPlayer.currentTime;
106106
break;
107107
case 2:
108108
vimeoPlayer.getCurrentTime().then(function(seconds) {
@@ -200,28 +200,8 @@ function enqueueVideo(roomnum) {
200200
// Actually change the video!
201201
socket.emit('enqueue video', {
202202
room: roomnum,
203-
videoId: videoId
204-
});
205-
206-
// Generate notify alert
207-
$.notify({
208-
title: '<strong>Video Added to Queue: </strong>',
209-
icon: 'fas fa-plus',
210-
message: videoId
211-
}, {
212-
type: 'info',
213-
delay: 800,
214-
animate: {
215-
enter: 'animated fadeInUp',
216-
exit: 'animated fadeOutRight'
217-
},
218-
placement: {
219-
from: "bottom",
220-
align: "right"
221-
},
222-
offset: 20,
223-
spacing: 10,
224-
z_index: 1031,
203+
videoId: videoId,
204+
user: username
225205
});
226206
}
227207

@@ -262,7 +242,7 @@ function changeVideo(roomnum) {
262242
videoId = idParse(videoId)
263243

264244
var time = getTime()
265-
console.log("The time is this man: "+time)
245+
console.log("The time is this man: " + time)
266246
// Actually change the video!
267247
socket.emit('change video', {
268248
room: roomnum,
@@ -297,7 +277,7 @@ function prevVideo(roomnum) {
297277
videoId: data.videoId,
298278
time: time,
299279
prev: true
300-
}, function(data){
280+
}, function(data) {
301281
// Set to the previous time
302282
setTimeout(function() {
303283
seekTo(prevTime)

js/yt.js

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,13 +98,20 @@ function play() {
9898

9999
socket.on('get title', function(data, callback) {
100100
var videoId = data.videoId
101+
var user = data.user
101102
$.get(
102103
"https://www.googleapis.com/youtube/v3/videos", {
103104
part: 'snippet',
104105
id: videoId,
105106
key: yt3_api
106107
},
107108
function(data) {
109+
// enqueueNotify(user, data.items[0].snippet.title)
110+
socket.emit('notify alerts', {
111+
alert: 0,
112+
user: user,
113+
title: data.items[0].snippet.title
114+
});
108115
// Does a callback and returns title
109116
callback({
110117
videoId: videoId,

server.js

Lines changed: 35 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,10 +150,12 @@ io.sockets.on('connection', function(socket) {
150150
// Enqueue video
151151
// Gets title then calls back
152152
socket.on('enqueue video', function(data) {
153+
var user = data.user
153154
// callback
154155
// See yt.js file
155156
socket.emit('get title', {
156-
videoId: data.videoId
157+
videoId: data.videoId,
158+
user: user
157159
}, function(data) {
158160
// Data contains videoId and title
159161
var videoId = data.videoId
@@ -181,6 +183,16 @@ io.sockets.on('connection', function(socket) {
181183
console.log("Error invalid player id")
182184
}
183185
console.log(io.sockets.adapter.rooms['room-' + socket.roomnum].queue.yt)
186+
187+
// Call notify
188+
// DEPRECATED - NOW THE SOCKET ITSELF CALLS 'notify alerts' from within the get title function
189+
// io.sockets.in("room-"+socket.roomnum).emit('enqueueNotify', {
190+
// videoId: videoId,
191+
// title: title,
192+
// user: user
193+
// })
194+
195+
// Update front end
184196
updateQueueVideos()
185197
})
186198
})
@@ -727,6 +739,28 @@ io.sockets.on('connection', function(socket) {
727739

728740
});
729741

742+
// Calls notify functions
743+
// NOT YET FINISHED
744+
socket.on('notify alerts', function(data) {
745+
var alert = data.alert
746+
747+
switch (alert) {
748+
// Enqueue alert
749+
case 0:
750+
io.sockets.in("room-" + socket.roomnum).emit('enqueueNotify', {
751+
user: data.user,
752+
title: data.title
753+
});
754+
break;
755+
case 1:
756+
break;
757+
case 2:
758+
break;
759+
default:
760+
console.log("Error alert id")
761+
}
762+
})
763+
730764
//------------------------------------------------------------------------------
731765
// Async get current time
732766
socket.on('auto sync', function(data) {

0 commit comments

Comments
 (0)