From 2f9c6051178984d698ad4ba1c3bccc48e502451e Mon Sep 17 00:00:00 2001 From: TheConnMan Date: Sun, 19 Feb 2017 14:37:59 -0500 Subject: [PATCH 01/35] Switch all YouTube REST calls to use the YouTube lib --- api/services/YouTubeService.js | 50 ++++++++++++++++++++++------------ 1 file changed, 33 insertions(+), 17 deletions(-) diff --git a/api/services/YouTubeService.js b/api/services/YouTubeService.js index ab8d3d3..9a56f21 100644 --- a/api/services/YouTubeService.js +++ b/api/services/YouTubeService.js @@ -30,10 +30,13 @@ function parseYouTubeLink(link) { function getYouTubeVideo(key, user, canSave=true) { return new Promise((resolve, reject) => { - request(`https://www.googleapis.com/youtube/v3/videos?id=${key}&part=snippet,contentDetails&key=${process.env.GOOGLE_API_KEY}`, (error, response, body) => { - if (!error && response.statusCode == 200) { + Youtube.videos.list({ + id: key, + part: 'snippet,contentDetails' + }, (error, data) => { + if (!error) { try { - parseYouTubeVideo(JSON.parse(body), user, canSave).then((video, err) => { + parseYouTubeVideo(data, user, canSave).then((video, err) => { if (err) { throw err; } @@ -73,9 +76,14 @@ function parseYouTubeVideo(data, user, canSave) { function search(query, maxResults) { return new Promise((resolve, reject) => { - request(`https://www.googleapis.com/youtube/v3/search?q=${query}&part=snippet&key=${process.env.GOOGLE_API_KEY}&maxResults=${maxResults || 15}&type=video,playlist`, (error, response, body) => { - if (!error && response.statusCode == 200) { - var results = JSON.parse(body).items.map(function(video) { + Youtube.search.list({ + q: query, + part: 'snippet', + maxResults: maxResults || 15, + type: 'video,playlist' + }, (error, data) => { + if (!error) { + var results = data.items.map(function(video) { var item = { playlistId: video.id.playlistId, key: video.id.videoId, @@ -97,7 +105,7 @@ function enrichPlaylist(playlist) { Youtube.playlistItems.list({ playlistId: playlist.playlistId, part: 'snippet,contentDetails' - }, (err, data) => { + }, (error, data) => { playlist.playlistItems = data.pageInfo.totalResults; resolve(playlist); }); @@ -109,7 +117,7 @@ function enrichVideo(video) { Youtube.videos.list({ id: video.key, part: 'snippet,contentDetails' - }, (err, data) => { + }, (error, data) => { video.duration = data.items.length == 1 ? moment.duration(data.items[0].contentDetails.duration).asMilliseconds() : undefined; resolve(video); }); @@ -136,14 +144,18 @@ function nextRelated(key) { function relatedVideos(key, maxResults = 10) { return new Promise((resolve, reject) => { - request(`https://www.googleapis.com/youtube/v3/search?relatedToVideoId=${key}&part=snippet&key=${process.env.GOOGLE_API_KEY}&maxResults=${maxResults}&type=video`, (error, response, body) => { - if (!error && response.statusCode == 200) { - var items = JSON.parse(body).items; - if (items.length === 0) { + Youtube.search.list({ + relatedToVideoId: key, + part: 'snippet', + maxResults: maxResults, + type: 'video' + }, (error, data) => { + if (!error) { + if (data.items.length === 0) { reject('No related video found'); } - var itemsPromise = items.map((i) => { + var itemsPromise = data.items.map((i) => { return getYouTubeVideo(i.id.videoId, 'JukeBot', false); }); @@ -171,10 +183,14 @@ function getPlaylistVideos(playlistId, user) { function getPlaylistVideosRecursive(playlistId, videos, pageToken) { return new Promise((resolve, reject) => { if (pageToken === '' || pageToken) { - request(`https://www.googleapis.com/youtube/v3/playlistItems?maxResults=50&part=snippet&key=${process.env.GOOGLE_API_KEY}&playlistId=${playlistId}&pageToken=${pageToken}`, (error, response, body) => { - if (!error && response.statusCode == 200) { - let playlist = JSON.parse(body); - getPlaylistVideosRecursive(playlistId, videos.concat(playlist.items), playlist.nextPageToken).then(function(videos) { + Youtube.playlistItems.list({ + maxResults: 50, + part: 'snippet', + playlistId: playlistId, + pageToken: pageToken + }, (error, data) => { + if (!error) { + getPlaylistVideosRecursive(playlistId, videos.concat(data.items), data.nextPageToken).then(function(videos) { resolve(videos); }); } else { From 1e14da05b54a6f1ce3f8db425f6a9e13c5fee55c Mon Sep 17 00:00:00 2001 From: TheConnMan Date: Mon, 1 May 2017 18:34:46 -0400 Subject: [PATCH 02/35] Add MySQL support --- README.md | 77 ++++++++++++++++++++++++------------ config/connections.js | 92 ++++--------------------------------------- config/models.js | 16 ++------ package.json | 1 + 4 files changed, 62 insertions(+), 124 deletions(-) diff --git a/README.md b/README.md index 997457d..5b03f1b 100644 --- a/README.md +++ b/README.md @@ -2,8 +2,7 @@ [Demo](https://demo.jukebot.club/) -[![Build Status](https://travis-ci.org/TheConnMan/jukebot.svg?branch=master)](https://travis-ci.org/TheConnMan/jukebot) -[![Docker Pulls](https://img.shields.io/docker/pulls/theconnman/jukebot.svg)](https://hub.docker.com/r/theconnman/jukebot/) +[![Build Status](https://travis-ci.org/TheConnMan/jukebot.svg?branch=master)](https://travis-ci.org/TheConnMan/jukebot) [![Docker Pulls](https://img.shields.io/docker/pulls/theconnman/jukebot.svg)](https://hub.docker.com/r/theconnman/jukebot/) Slack-Enabled Syncronized Music Listening @@ -12,39 +11,48 @@ Slack-Enabled Syncronized Music Listening **JukeBot** is for Slack teams who want to listen to music together, add music through Slack, and chat about the music in a Slack channel. ## Local Development + To get started with local development follow these steps: 1. Clone this repo and `cd` into it -1. Install **JukeBot** dependencies with `npm install` (make sure you're on npm v3+) -1. Get a Google API key using the setup steps below -1. Run **JukeBot** with `GOOGLE_API_KEY= npm start` and go to http://localhost:1337 +2. Install **JukeBot** dependencies with `npm install` (make sure you're on npm v3+) +3. Get a Google API key using the setup steps below +4. Run **JukeBot** with `GOOGLE_API_KEY= npm start` and go to ## Setup + ### Google API Key for YouTube -1. Go to https://console.developers.google.com -1. Create a new Google Project named JukeBot -1. Under **Create credentials** choose **API key** and use the API key for the environment variable below -1. Click **Library** in the left panel -1. Go to **YouTube Data API** -1. Click **Enable** at the top + +1. Go to +2. Create a new Google Project named JukeBot +3. Under **Create credentials** choose **API key** and use the API key for the environment variable below +4. Click **Library** in the left panel +5. Go to **YouTube Data API** +6. Click **Enable** at the top ### Slash Command (Optional) + To use a Slack Slash Command you'll need to set one up (preferably after the running the deployment steps below) and follow these instructions: 1. Go to the [Slack Slash Command setup page](https://my.slack.com/apps/A0F82E8CA-slash-commands), add a configuration, and name it **JukeBot** -1. Input the URL you configure during the deployment step and add a trailing `/slack/slash` (e.g. jukebot.my.domain.com/slack/slash) -1. Change the request method to GET -1. Copy the **Token** and use it as the **SLASH_TOKEN** environment variable -1. Customize the name to **JukeBot** -1. Check the box to "Show this command in the autocomplete list" -1. Add the description "Slack-Enabled Syncronized Music Listening" -1. Add the usage hint "add - Add a YouTube video to the playlist" -1. Click save! +2. Input the URL you configure during the deployment step and add a trailing `/slack/slash` (e.g. jukebot.my.domain.com/slack/slash) +3. Change the request method to GET +4. Copy the **Token** and use it as the **SLASH_TOKEN** environment variable +5. Customize the name to **JukeBot** +6. Check the box to "Show this command in the autocomplete list" +7. Add the description "Slack-Enabled Syncronized Music Listening" +8. Add the usage hint "add + + - Add a YouTube video to the playlist" + +9. Click save! ## Deployment + **WARNING:** Data persistence is not currently a priority. Videos are considered to be transient and once they are more than 24 hours old they aren't shown in the UI. Due to this, schema migrations are not a high priority. ### Deployment without HTTPS + **JukeBot** can easily be run with Docker using the following command: ```bash @@ -54,28 +62,45 @@ docker run -d -p 80:1337 -e GOOGLE_API_KEY= theconnman/jukebot:lat Make sure to add any additional environment variables as well to the above command. Then go to the URL of your server and listen to some music! ### Deployment with HTTPS (Required when using a Slash Command) -Slack Slash Commands require the slash command endpoint to be HTTPS, so JukeBot uses [Let's Encrypt](https://letsencrypt.org/) to get an SSL cert. You'll need to be hosting JukeBot on a domain you have DNS authority over for this to work as you'll need to create a couple DNS entries. Make sure you have entries pointing to the current box for the domain or subdomain to be used in the deployment as well as the wildcard subdomains of the given domain (e.g. \*.projects.theconnman.com). This is not only so Slack can locate your deployment, but also so Let's Encrypt can negotiate for your SSL cert. + +Slack Slash Commands require the slash command endpoint to be HTTPS, so JukeBot uses [Let's Encrypt](https://letsencrypt.org/) to get an SSL cert. You'll need to be hosting JukeBot on a domain you have DNS authority over for this to work as you'll need to create a couple DNS entries. Make sure you have entries pointing to the current box for the domain or subdomain to be used in the deployment as well as the wildcard subdomains of the given domain (e.g. *.projects.theconnman.com). This is not only so Slack can locate your deployment, but also so Let's Encrypt can negotiate for your SSL cert. Within this project are three files needing to be modified when deploying this project to your own server: `docker-compose.yml`, `traefik.toml`, and `.env`. -####`docker-compose.yml` +#### `docker-compose.yml` 1. Replace the two **localhost** references with your own domain or subdomain which points to the current box (e.g. projects.theconnman.com). -1. Update the volume paths so they point to the correct location in your host. +2. Update the volume paths so they point to the correct location in your host. -####`traefik.toml` +#### `traefik.toml` 1. Replace the email address with your own and the domain from localhost to the same one as before. -1. After saving that file, issue a `touch acme.json` to create an empty credentials file. +2. After saving that file, issue a `touch acme.json` to create an empty credentials file. -####`example.env` +#### `example.env` 1. Copy the provided example.env file to `.env`. -1. Modify the example environment variables (described below) before running JukeBot. +2. Modify the example environment variables (described below) before running JukeBot. After that run `docker-compose up -d` and you should be able to access the UI at jukebox.my.domain.com (after replacing with your domain or subdomain of course). +## Running with MySQL + +The default database is on disk, so it is recommended to run **JukeBot** with a MySQL DB in production. Use the following environment variables: + +- MYSQL_HOST (MySQL will be used as the datastore if this is supplied) +- MYSQL_USER (default: sails) +- MYSQL_PASSWORD (default: sails) +- MYSQL_DB (default: sails) + +The easiest way to run a MySQL instance is to run it in Docker using the following command: + +```bash +docker run -d -p 3306:3306 -e MYSQL_DATABASE=sails -e MYSQL_USER=sails -e MYSQL_PASSWORD=sails -e MYSQL_RANDOM_ROOT_PASSWORD=true --name=mysql mysql +``` + ## Environment Variables + - **GOOGLE_API_KEY** - Google project API key - **SLACK_WEBHOOK** (Optional) - [Slack Incoming Webhook URL](https://my.slack.com/apps/A0F7XDUAZ-incoming-webhooks) for sending song addition and currently now playing notifications - **SLACK_SONG_ADDED** (default: true) - Toggle for "Song Added" Slack notifications, only applicable if **SLACK_WEBHOOK** is provided diff --git a/config/connections.js b/config/connections.js index a07b9cd..6133918 100644 --- a/config/connections.js +++ b/config/connections.js @@ -1,94 +1,16 @@ -/** - * Connections - * (sails.config.connections) - * - * `Connections` are like "saved settings" for your adapters. What's the difference between - * a connection and an adapter, you might ask? An adapter (e.g. `sails-mysql`) is generic-- - * it needs some additional information to work (e.g. your database host, password, user, etc.) - * A `connection` is that additional information. - * - * Each model must have a `connection` property (a string) which is references the name of one - * of these connections. If it doesn't, the default `connection` configured in `config/models.js` - * will be applied. Of course, a connection can (and usually is) shared by multiple models. - * . - * Note: If you're using version control, you should put your passwords/api keys - * in `config/local.js`, environment variables, or use another strategy. - * (this is to prevent you inadvertently sensitive credentials up to your repository.) - * - * For more information on configuration, check out: - * http://sailsjs.org/#!/documentation/reference/sails.config/sails.config.connections.html - */ - module.exports.connections = { - - /*************************************************************************** - * * - * Local disk storage for DEVELOPMENT ONLY * - * * - * Installed by default. * - * * - ***************************************************************************/ localDiskDb: { adapter: 'sails-disk', filePath: 'data/', fileName: 'jukebot.db' }, - /*************************************************************************** - * * - * MySQL is the world's most popular relational database. * - * http://en.wikipedia.org/wiki/MySQL * - * * - * Run: npm install sails-mysql * - * * - ***************************************************************************/ - // someMysqlServer: { - // adapter: 'sails-mysql', - // host: 'YOUR_MYSQL_SERVER_HOSTNAME_OR_IP_ADDRESS', - // user: 'YOUR_MYSQL_USER', //optional - // password: 'YOUR_MYSQL_PASSWORD', //optional - // database: 'YOUR_MYSQL_DB' //optional - // }, - - /*************************************************************************** - * * - * MongoDB is the leading NoSQL database. * - * http://en.wikipedia.org/wiki/MongoDB * - * * - * Run: npm install sails-mongo * - * * - ***************************************************************************/ - // someMongodbServer: { - // adapter: 'sails-mongo', - // host: 'localhost', - // port: 27017, - // user: 'username', //optional - // password: 'password', //optional - // database: 'your_mongo_db_name_here' //optional - // }, - - /*************************************************************************** - * * - * PostgreSQL is another officially supported relational database. * - * http://en.wikipedia.org/wiki/PostgreSQL * - * * - * Run: npm install sails-postgresql * - * * - * * - ***************************************************************************/ - // somePostgresqlServer: { - // adapter: 'sails-postgresql', - // host: 'YOUR_POSTGRES_SERVER_HOSTNAME_OR_IP_ADDRESS', - // user: 'YOUR_POSTGRES_USER', // optional - // password: 'YOUR_POSTGRES_PASSWORD', // optional - // database: 'YOUR_POSTGRES_DB' //optional - // } - - - /*************************************************************************** - * * - * More adapters: https://github.com/balderdashy/sails * - * * - ***************************************************************************/ + mysql: { + adapter: 'sails-mysql', + host: process.env.MYSQL_HOST, + user: process.env.MYSQL_USER || 'sails', + password: process.env.MYSQL_PASSWORD || 'sails', + database: process.env.MYSQL_DB || 'sails', + } }; diff --git a/config/models.js b/config/models.js index f77d7a7..c787b64 100644 --- a/config/models.js +++ b/config/models.js @@ -1,15 +1,5 @@ -/** - * Default model configuration - * (sails.config.models) - * - * Unless you override them, the following properties will be included - * in each of your models. - * - * For more info on Sails models, see: - * http://sailsjs.org/#!/documentation/concepts/ORM - */ - module.exports.models = { - migrate: 'alter', - connection: 'localDiskDb' + connection: process.env.MYSQL_HOST ? 'mysql' : 'localDiskDb', + + migrate: 'alter' }; diff --git a/package.json b/package.json index 170c0cc..91b6fd0 100644 --- a/package.json +++ b/package.json @@ -24,6 +24,7 @@ "rc": "1.0.1", "sails": "~0.12.7", "sails-disk": "~0.10.9", + "sails-mysql": "^0.11.5", "slack-webhook": "^1.0.0", "youtube-api": "^2.0.6" }, From 1725976f11b1e794e5b9cc071d16ddd5f5158c1f Mon Sep 17 00:00:00 2001 From: TheConnMan Date: Mon, 1 May 2017 20:30:37 -0400 Subject: [PATCH 03/35] Add initial DB schema migration --- Dockerfile | 2 +- README.md | 6 ++ config/migrations.js | 4 ++ config/models.js | 2 +- migrations/20170501223203-initial-schema.js | 71 +++++++++++++++++++++ package.json | 6 +- tasks/register/dbMigrate.js | 1 + 7 files changed, 89 insertions(+), 3 deletions(-) create mode 100644 config/migrations.js create mode 100644 migrations/20170501223203-initial-schema.js create mode 100644 tasks/register/dbMigrate.js diff --git a/Dockerfile b/Dockerfile index 026fcbd..b784aff 100644 --- a/Dockerfile +++ b/Dockerfile @@ -11,4 +11,4 @@ COPY . /usr/src/app EXPOSE 1337 -CMD npm start +CMD if [[ -z "${MYSQL_HOST}" ]]; then npm start; else npm run migrate && node app.js; fi diff --git a/README.md b/README.md index 5b03f1b..46a42fb 100644 --- a/README.md +++ b/README.md @@ -99,6 +99,12 @@ The easiest way to run a MySQL instance is to run it in Docker using the followi docker run -d -p 3306:3306 -e MYSQL_DATABASE=sails -e MYSQL_USER=sails -e MYSQL_PASSWORD=sails -e MYSQL_RANDOM_ROOT_PASSWORD=true --name=mysql mysql ``` +### Developing with MySQL + +Using MySQL automatically sets the migration strategy to `safe`, so running with MySQL requires you to run `npm migrate` with the appropriate environment variables to bring the DB schema up to speed. + +When developing a new migration script run `grunt db:migrate:create --name=` and implement the `up` and `down` steps once the migration is created. + ## Environment Variables - **GOOGLE_API_KEY** - Google project API key diff --git a/config/migrations.js b/config/migrations.js new file mode 100644 index 0000000..c47e082 --- /dev/null +++ b/config/migrations.js @@ -0,0 +1,4 @@ +module.exports.migrations = { + + connection: 'mysql' +}; diff --git a/config/models.js b/config/models.js index c787b64..3473674 100644 --- a/config/models.js +++ b/config/models.js @@ -1,5 +1,5 @@ module.exports.models = { connection: process.env.MYSQL_HOST ? 'mysql' : 'localDiskDb', - migrate: 'alter' + migrate: process.env.MYSQL_HOST ? 'safe' : 'alter' }; diff --git a/migrations/20170501223203-initial-schema.js b/migrations/20170501223203-initial-schema.js new file mode 100644 index 0000000..9df489b --- /dev/null +++ b/migrations/20170501223203-initial-schema.js @@ -0,0 +1,71 @@ +'use strict'; + +var dbm; +var type; +var seed; + +/** + * We receive the dbmigrate dependency from dbmigrate initially. + * This enables us to not have to rely on NODE_PATH. + */ +exports.setup = function(options, seedLink) { + dbm = options.dbmigrate; + type = dbm.dataType; + seed = seedLink; +}; + +exports.up = function(db, callback) { + createChats(db).then(() => { + return createVideos(db); + }).then(callback); +}; + +exports.down = function(db) { + return db.dropTable('chat', null, db.dropTable('video', null, callback)); +}; + +exports._meta = { + "version": 1 +}; + +function createChats(db) { + return new Promise((resolve, reject) => { + db.createTable('chat', { + id: { + type: 'int', + primaryKey: true, + autoIncrement: true + }, + username: 'string', + message: 'string', + type: 'string', + time: 'datetime', + data: 'string', + createdAt: 'datetime', + updatedAt: 'datetime' + }, resolve); + }); +} + +function createVideos(db) { + return new Promise((resolve, reject) => { + db.createTable('video', { + id: { + type: 'int', + primaryKey: true, + autoIncrement: true + }, + key: 'string', + title: 'string', + duration: 'int', + user: 'string', + startTime: 'datetime', + thumbnail: 'string', + playing: 'boolean', + played: 'boolean', + isSuggestion: 'boolean', + createdAt: 'datetime', + updatedAt: 'datetime' + }, resolve); + }); +} diff --git a/package.json b/package.json index 91b6fd0..50c3baa 100644 --- a/package.json +++ b/package.json @@ -4,6 +4,8 @@ "description": "Slack-Enabled Syncronized Music Listening", "keywords": [], "dependencies": { + "db-migrate": "^0.10.0-beta.20", + "db-migrate-mysql": "^1.1.10", "ejs": "2.3.4", "fluent-logger": "github:theconnman/fluent-logger-node", "grunt": "1.0.1", @@ -23,6 +25,7 @@ "moment": "^2.17.1", "rc": "1.0.1", "sails": "~0.12.7", + "sails-db-migrate": "^1.5.0", "sails-disk": "~0.10.9", "sails-mysql": "^0.11.5", "slack-webhook": "^1.0.0", @@ -30,7 +33,8 @@ }, "scripts": { "debug": "node debug app.js", - "start": "node app.js" + "start": "node app.js", + "migrate": "grunt db:migrate:up" }, "main": "app.js", "repository": { diff --git a/tasks/register/dbMigrate.js b/tasks/register/dbMigrate.js new file mode 100644 index 0000000..f43e12f --- /dev/null +++ b/tasks/register/dbMigrate.js @@ -0,0 +1 @@ +module.exports = require('sails-db-migrate').gruntTasks; From 98532a9822ab89a9c73b7940928d119161fb555d Mon Sep 17 00:00:00 2001 From: TheConnMan Date: Tue, 2 May 2017 19:14:55 -0400 Subject: [PATCH 04/35] Add callback parameter to DB migration down step --- migrations/20170501223203-initial-schema.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/migrations/20170501223203-initial-schema.js b/migrations/20170501223203-initial-schema.js index 9df489b..7a882f0 100644 --- a/migrations/20170501223203-initial-schema.js +++ b/migrations/20170501223203-initial-schema.js @@ -20,7 +20,7 @@ exports.up = function(db, callback) { }).then(callback); }; -exports.down = function(db) { +exports.down = function(db, callback) { return db.dropTable('chat', null, db.dropTable('video', null, callback)); }; From 6ca20f8f26e5f8cd530894e507edfec2d3ca3869 Mon Sep 17 00:00:00 2001 From: TheConnMan Date: Tue, 2 May 2017 19:22:21 -0400 Subject: [PATCH 05/35] Add user object and realuser fields --- api/models/Chat.js | 3 +- api/models/User.js | 14 ++++++ api/models/Video.js | 1 + migrations/20170502230145-user-properties.js | 46 ++++++++++++++++++++ 4 files changed, 63 insertions(+), 1 deletion(-) create mode 100644 api/models/User.js create mode 100644 migrations/20170502230145-user-properties.js diff --git a/api/models/Chat.js b/api/models/Chat.js index a8beedb..54b3722 100644 --- a/api/models/Chat.js +++ b/api/models/Chat.js @@ -20,7 +20,8 @@ module.exports = { data: { type: 'string', required: false - } + }, + realuser: 'String' // room: { // model: 'room' // } diff --git a/api/models/User.js b/api/models/User.js new file mode 100644 index 0000000..e3691b6 --- /dev/null +++ b/api/models/User.js @@ -0,0 +1,14 @@ +module.exports = { + + attributes: { + provider: 'String', + uid: 'String', + name: 'String', + email: 'String', + + properties: { + type: 'json', + defaultsTo: '{}' + }, + } +}; diff --git a/api/models/Video.js b/api/models/Video.js index b7690db..ab3c886 100644 --- a/api/models/Video.js +++ b/api/models/Video.js @@ -17,6 +17,7 @@ module.exports = { type: 'string', required: true }, + realuser: 'String', startTime: { type: 'datetime' }, diff --git a/migrations/20170502230145-user-properties.js b/migrations/20170502230145-user-properties.js new file mode 100644 index 0000000..51f9848 --- /dev/null +++ b/migrations/20170502230145-user-properties.js @@ -0,0 +1,46 @@ +'use strict'; + +var dbm; +var type; +var seed; + +/** + * We receive the dbmigrate dependency from dbmigrate initially. + * This enables us to not have to rely on NODE_PATH. + */ +exports.setup = function(options, seedLink) { + dbm = options.dbmigrate; + type = dbm.dataType; + seed = seedLink; +}; + +exports.up = function(db, callback) { + createUsers(db).then(db.addColumn('chat', 'realuser', 'string', db.addColumn('video', 'realuser', 'string', callback))); +}; + +exports.down = function(db, callback) { + return db.dropTable('user', null, db.removeColumn('chat', 'realuser', db.removeColumn('video', 'realuser', callback))); +}; + +exports._meta = { + "version": 1 +}; + +function createUsers(db) { + return new Promise((resolve, reject) => { + db.createTable('user', { + id: { + type: 'int', + primaryKey: true, + autoIncrement: true + }, + provider: 'string', + uid: 'string', + name: 'string', + email: 'string', + properties: 'text', + createdAt: 'datetime', + updatedAt: 'datetime' + }, resolve); + }); +} From 8798f4db75029db63ec9fb31f166b10093a77d26 Mon Sep 17 00:00:00 2001 From: TheConnMan Date: Wed, 3 May 2017 16:50:21 -0400 Subject: [PATCH 06/35] Add Google auth --- README.md | 2 + api/controllers/AuthController.js | 31 +++++++++ config/bootstrap.js | 48 +++++++++++++ config/globals.js | 9 ++- config/http.js | 110 ++++++------------------------ config/policies.js | 49 +------------ config/routes.js | 46 +------------ package.json | 2 + 8 files changed, 116 insertions(+), 181 deletions(-) create mode 100644 api/controllers/AuthController.js diff --git a/README.md b/README.md index 46a42fb..600b584 100644 --- a/README.md +++ b/README.md @@ -108,6 +108,8 @@ When developing a new migration script run `grunt db:migrate:create --name= { var pair = tag.split(':'); diff --git a/config/globals.js b/config/globals.js index f9da8c5..5cef1a6 100644 --- a/config/globals.js +++ b/config/globals.js @@ -7,5 +7,12 @@ module.exports.globals = { googleAnalyticsId: process.env.GOOGLE_ANALYTICS_ID, chatHistory: process.env.CHAT_HISTORY ? parseInt(process.env.CHAT_HISTORY) : 24 * 60, videoHistory: process.env.VIDEO_HISTORY ? parseInt(process.env.VIDEO_HISTORY) : 24 * 60, - autoplayDisableCount: process.env.AUTOPLAY_DISABLE_STREAK ? parseInt(process.env.AUTOPLAY_DISABLE_STREAK) : 10 + autoplayDisableCount: process.env.AUTOPLAY_DISABLE_STREAK ? parseInt(process.env.AUTOPLAY_DISABLE_STREAK) : 10, + + oauth: { + google: { + clientID: process.env.GOOGLE_ID, + clientSecret: process.env.GOOGLE_SECRET + }, + } }; diff --git a/config/http.js b/config/http.js index 1d096f4..9ee185e 100644 --- a/config/http.js +++ b/config/http.js @@ -1,93 +1,27 @@ -/** - * HTTP Server Settings - * (sails.config.http) - * - * Configuration for the underlying HTTP server in Sails. - * Only applies to HTTP requests (not WebSockets) - * - * For more information on configuration, check out: - * http://sailsjs.org/#!/documentation/reference/sails.config/sails.config.http.html - */ - module.exports.http = { - /**************************************************************************** - * * - * Express middleware to use for every Sails request. To add custom * - * middleware to the mix, add a function to the middleware config object and * - * add its key to the "order" array. The $custom key is reserved for * - * backwards-compatibility with Sails v0.9.x apps that use the * - * `customMiddleware` config option. * - * * - ****************************************************************************/ - middleware: { - /*************************************************************************** - * * - * The order in which middleware should be run for HTTP request. (the Sails * - * router is invoked by the "router" middleware below.) * - * * - ***************************************************************************/ - - // order: [ - // 'startRequestTimer', - // 'cookieParser', - // 'session', - // 'myRequestLogger', - // 'bodyParser', - // 'handleBodyParserError', - // 'compress', - // 'methodOverride', - // 'poweredBy', - // '$custom', - // 'router', - // 'www', - // 'favicon', - // '404', - // '500' - // ], - - /**************************************************************************** - * * - * Example custom middleware; logs each request to the console. * - * * - ****************************************************************************/ - - // myRequestLogger: function (req, res, next) { - // console.log("Requested :: ", req.method, req.url); - // return next(); - // } - - - /*************************************************************************** - * * - * The body parser that will handle incoming multipart HTTP requests. By * - * default as of v0.10, Sails uses * - * [skipper](http://github.com/balderdashy/skipper). See * - * http://www.senchalabs.org/connect/multipart.html for other options. * - * * - * Note that Sails uses an internal instance of Skipper by default; to * - * override it and specify more options, make sure to "npm install skipper" * - * in your project first. You can also specify a different body parser or * - * a custom function with req, res and next parameters (just like any other * - * middleware function). * - * * - ***************************************************************************/ - - // bodyParser: require('skipper')({strict: true}) - - }, - - /*************************************************************************** - * * - * The number of seconds to cache flat files on disk being served by * - * Express static middleware (by default, these files are in `.tmp/public`) * - * * - * The HTTP static cache is only active in a 'production' environment, * - * since that's the only time Express will cache flat-files. * - * * - ***************************************************************************/ - - // cache: 31557600000 + passportInit: require('passport').initialize(), + passportSession: require('passport').session(), + + order: [ + 'startRequestTimer', + 'cookieParser', + 'session', + 'passportInit', + 'passportSession', + 'myRequestLogger', + 'bodyParser', + 'handleBodyParserError', + 'compress', + 'methodOverride', + 'poweredBy', + 'router', + 'www', + 'favicon', + '404', + '500' + ] + } }; diff --git a/config/policies.js b/config/policies.js index 1785d4e..3ae3aff 100644 --- a/config/policies.js +++ b/config/policies.js @@ -1,51 +1,4 @@ -/** - * Policy Mappings - * (sails.config.policies) - * - * Policies are simple functions which run **before** your controllers. - * You can apply one or more policies to a given controller, or protect - * its actions individually. - * - * Any policy file (e.g. `api/policies/authenticated.js`) can be accessed - * below by its filename, minus the extension, (e.g. "authenticated") - * - * For more information on how policies work, see: - * http://sailsjs.org/#!/documentation/concepts/Policies - * - * For more information on configuring policies, check out: - * http://sailsjs.org/#!/documentation/reference/sails.config/sails.config.policies.html - */ - - module.exports.policies = { - /*************************************************************************** - * * - * Default policy for all controllers and actions (`true` allows public * - * access) * - * * - ***************************************************************************/ - - // '*': true, - - /*************************************************************************** - * * - * Here's an example of mapping some policies to run before a controller * - * and its actions * - * * - ***************************************************************************/ - // RabbitController: { - - // Apply the `false` policy as the default for all of RabbitController's actions - // (`false` prevents all access, which ensures that nothing bad happens to our rabbits) - // '*': false, - - // For the action `nurture`, apply the 'isRabbitMother' policy - // (this overrides `false` above) - // nurture : 'isRabbitMother', - - // Apply the `isNiceToAnimals` AND `hasRabbitFood` policies - // before letting any users feed our rabbits - // feed : ['isNiceToAnimals', 'hasRabbitFood'] - // } + '*': true, }; diff --git a/config/routes.js b/config/routes.js index 5d769d3..97709e7 100644 --- a/config/routes.js +++ b/config/routes.js @@ -1,49 +1,7 @@ -/** - * Route Mappings - * (sails.config.routes) - * - * Your routes map URLs to views and controllers. - * - * If Sails receives a URL that doesn't match any of the routes below, - * it will check for matching files (images, scripts, stylesheets, etc.) - * in your assets directory. e.g. `http://localhost:1337/images/foo.jpg` - * might match an image file: `/assets/images/foo.jpg` - * - * Finally, if those don't match either, the default 404 handler is triggered. - * See `api/responses/notFound.js` to adjust your app's 404 logic. - * - * Note: Sails doesn't ACTUALLY serve stuff from `assets`-- the default Gruntfile in Sails copies - * flat files from `assets` to `.tmp/public`. This allows you to do things like compile LESS or - * CoffeeScript for the front-end. - * - * For more information on configuring custom routes, check out: - * http://sailsjs.org/#!/documentation/concepts/Routes/RouteTargetSyntax.html - */ - module.exports.routes = { - /*************************************************************************** - * * - * Make the view located at `views/homepage.ejs` (or `views/homepage.jade`, * - * etc. depending on your default view engine) your home page. * - * * - * (Alternatively, remove this and add an `index.html` file in your * - * `assets` directory) * - * * - ***************************************************************************/ - '/': { view: 'homepage' - } - - /*************************************************************************** - * * - * Custom routes here... * - * * - * If a request to a URL doesn't match any of the custom routes above, it * - * is matched against Sails route blueprints. See `config/blueprints.js` * - * for configuration options and examples. * - * * - ***************************************************************************/ - + }, + '/logout': 'AuthController.logout' }; diff --git a/package.json b/package.json index 50c3baa..f15ce2a 100644 --- a/package.json +++ b/package.json @@ -23,6 +23,8 @@ "include-all": "^1.0.0", "log4js": "^1.0.1", "moment": "^2.17.1", + "passport": "^0.3.2", + "passport-google-oauth": "^1.0.0", "rc": "1.0.1", "sails": "~0.12.7", "sails-db-migrate": "^1.5.0", From fbfca7a34fbcf64a896627000d1a7450d91139cf Mon Sep 17 00:00:00 2001 From: TheConnMan Date: Wed, 3 May 2017 18:20:53 -0400 Subject: [PATCH 07/35] Add login and logout link --- api/controllers/HomeController.js | 7 +++++++ config/routes.js | 4 +--- views/partials/header.ejs | 9 +++++++++ 3 files changed, 17 insertions(+), 3 deletions(-) create mode 100644 api/controllers/HomeController.js diff --git a/api/controllers/HomeController.js b/api/controllers/HomeController.js new file mode 100644 index 0000000..659db9d --- /dev/null +++ b/api/controllers/HomeController.js @@ -0,0 +1,7 @@ +module.exports = { + index: function(req, res) { + res.view('homepage', { + user: req.user + }); + } +}; diff --git a/config/routes.js b/config/routes.js index 97709e7..031f15d 100644 --- a/config/routes.js +++ b/config/routes.js @@ -1,7 +1,5 @@ module.exports.routes = { + '/': 'HomeController.index', - '/': { - view: 'homepage' - }, '/logout': 'AuthController.logout' }; diff --git a/views/partials/header.ejs b/views/partials/header.ejs index af93e49..415a269 100644 --- a/views/partials/header.ejs +++ b/views/partials/header.ejs @@ -3,6 +3,15 @@
+ + <% if (user) { %> + + <%= user.name %> + <% } else { %> + + Login + <% } %> +
From 567ad3a70410c8d01ba26010d62c5411f712ccce Mon Sep 17 00:00:00 2001 From: TheConnMan Date: Thu, 4 May 2017 20:29:56 -0400 Subject: [PATCH 08/35] Show tooltip of real user on chat usernames --- api/controllers/ChatController.js | 53 +++++++++++++++++++------------ assets/components/chat.html | 2 +- assets/styles/jukebot.css | 8 +++++ 3 files changed, 42 insertions(+), 21 deletions(-) diff --git a/api/controllers/ChatController.js b/api/controllers/ChatController.js index 71788ec..0aee4f8 100644 --- a/api/controllers/ChatController.js +++ b/api/controllers/ChatController.js @@ -2,26 +2,39 @@ var typers = []; module.exports = { subscribe(req, res) { - req.socket.join('chatting'); - ChatService.getChats().then((chats) => { - sails.io.sockets.in('chatting').emit('chats', chats); - }); + if (req.session.passport) { + User.findOne({ + id: req.session.passport.user + }).then(user => { + subscribe(req, res, user.name); + }); + } else { + subscribe(req, res, null); + } + } +}; - req.socket.on('chat', function(chat) { - ChatService.addUserMessage(chat); - }); +function subscribe(req, res, user) { + req.socket.join('chatting'); + ChatService.getChats().then((chats) => { + sails.io.sockets.in('chatting').emit('chats', chats); + }); - req.socket.join('typers'); + req.socket.on('chat', function(chat) { + chat.realuser = user; + ChatService.addUserMessage(chat); + }); - req.socket.on('typers', function(data) { - var index = typers.indexOf(data.username); - if (data.typing && index === -1) { - typers.push(data.username); - sails.io.sockets.in('typers').emit('typers', typers); - } else if (!data.typing && index !== -1) { - typers.splice(index, 1); - sails.io.sockets.in('typers').emit('typers', typers); - } - }); - } -}; + req.socket.join('typers'); + + req.socket.on('typers', function(data) { + var index = typers.indexOf(data.username); + if (data.typing && index === -1) { + typers.push(data.username); + sails.io.sockets.in('typers').emit('typers', typers); + } else if (!data.typing && index !== -1) { + typers.splice(index, 1); + sails.io.sockets.in('typers').emit('typers', typers); + } + }); +} diff --git a/assets/components/chat.html b/assets/components/chat.html index cfc2784..8d6177c 100644 --- a/assets/components/chat.html +++ b/assets/components/chat.html @@ -14,7 +14,7 @@

Chat
-
+
{{chat.type == 'user' ? chat.username : 'JukeBot'}}
diff --git a/assets/styles/jukebot.css b/assets/styles/jukebot.css index e03b6f3..a8131fa 100644 --- a/assets/styles/jukebot.css +++ b/assets/styles/jukebot.css @@ -53,6 +53,14 @@ input { margin-left: 37.5%; } +#chat-list [data-tooltip]:not([data-position]):before { + left: 75%; +} + +#chat-list [data-tooltip]:not([data-position]):after { + left: 100%; +} + .d-f { display: flex; } From d038662af43aae8750eb045ded2bded4b6cc05ee Mon Sep 17 00:00:00 2001 From: TheConnMan Date: Thu, 4 May 2017 21:06:33 -0400 Subject: [PATCH 09/35] Add real user tooltips to liseners section --- api/controllers/ApiController.js | 69 +++++++++++++++++----------- views/partials/currently-playing.ejs | 4 +- 2 files changed, 44 insertions(+), 29 deletions(-) diff --git a/api/controllers/ApiController.js b/api/controllers/ApiController.js index 5849c68..c750c1d 100644 --- a/api/controllers/ApiController.js +++ b/api/controllers/ApiController.js @@ -6,35 +6,15 @@ var recentlyLeft = []; module.exports = { subscribeUsers: function(req, res) { - var params = req.allParams(); - var id = req.socket.id; - req.socket.join('listeners'); - - var username = params.username || 'Anonymous'; - users[id] = username; - - var index = recentlyLeft.indexOf(username); - if (index === -1) { - logger.debug(users[id] + ' entered the room'); - ChatService.addMachineMessage(users[id] + ' entered the room', username, 'userEnter'); + if (req.session.passport) { + User.findOne({ + id: req.session.passport.user + }).then(user => { + subscribeUsers(req, res, user.name); + }); } else { - recentlyLeft.splice(index, 1); + subscribeUsers(req, res, null); } - emitListeners(); - - req.socket.on('disconnect', function() { - var username = users[id]; - recentlyLeft.push(username); - delete users[id]; - setTimeout(function() { - userDisconnected(username); - }, 1000); - }); - - req.socket.on('username', function(d) { - users[id] = d || 'Anonymous'; - emitListeners(); - }); }, add: function(req, res) { @@ -145,6 +125,41 @@ module.exports = { } }; +function subscribeUsers(req, res, realuser) { + var params = req.allParams(); + var id = req.socket.id; + req.socket.join('listeners'); + + var username = params.username || 'Anonymous'; + users[id] = { + username, + realuser + }; + + var index = recentlyLeft.indexOf(username); + if (index === -1) { + logger.debug(users[id].username + ' entered the room'); + ChatService.addMachineMessage(users[id].username + ' entered the room', username, 'userEnter'); + } else { + recentlyLeft.splice(index, 1); + } + emitListeners(); + + req.socket.on('disconnect', function() { + var username = users[id].username; + recentlyLeft.push(username); + delete users[id]; + setTimeout(function() { + userDisconnected(username); + }, 1000); + }); + + req.socket.on('username', function(d) { + users[id].username = d || 'Anonymous'; + emitListeners(); + }); +} + function userDisconnected(username) { var index = recentlyLeft.indexOf(username); if (index !== -1) { diff --git a/views/partials/currently-playing.ejs b/views/partials/currently-playing.ejs index 32a07f0..fe0dc7b 100644 --- a/views/partials/currently-playing.ejs +++ b/views/partials/currently-playing.ejs @@ -45,8 +45,8 @@
- - {{user}} + + {{user.username}}
From c162e8ed3d7ad42dd35ce832b4a3192e3b31d50b Mon Sep 17 00:00:00 2001 From: TheConnMan Date: Thu, 4 May 2017 21:23:39 -0400 Subject: [PATCH 10/35] Show real username tooltip on videos --- api/controllers/ApiController.js | 22 +++++++++++++++------- api/controllers/SlackController.js | 2 +- api/services/SyncService.js | 2 +- api/services/YouTubeService.js | 13 +++++++------ assets/components/playlist-item.html | 2 +- views/partials/currently-playing.ejs | 2 +- 6 files changed, 26 insertions(+), 17 deletions(-) diff --git a/api/controllers/ApiController.js b/api/controllers/ApiController.js index c750c1d..480181d 100644 --- a/api/controllers/ApiController.js +++ b/api/controllers/ApiController.js @@ -20,10 +20,14 @@ module.exports = { add: function(req, res) { var params = req.allParams(); try { - var key = YouTubeService.parseYouTubeLink(params.link); - YouTubeService.getYouTubeVideo(key, params.user || 'Anonymous').then(SyncService.addVideo).then(SyncService.sendAddMessages).then(function(video) { - SyncService.resetAutoplayStreak(); - res.send(200); + User.findOne({ + id: req.session.passport ? req.session.passport.user : null + }).then(user => { + var key = YouTubeService.parseYouTubeLink(params.link); + YouTubeService.getYouTubeVideo(key, params.user || 'Anonymous', user ? user.name : null).then(SyncService.addVideo).then(SyncService.sendAddMessages).then(function(video) { + SyncService.resetAutoplayStreak(); + res.send(200); + }); }).catch(function(err) { res.send(400, err); }); @@ -35,9 +39,13 @@ module.exports = { addPlaylist: function(req, res) { var params = req.allParams(); try { - YouTubeService.getPlaylistVideos(params.playlistId, params.user || 'Anonymous').then(SyncService.addPlaylist).then(SyncService.sendPlaylistAddMessages).then(function(video) { - SyncService.resetAutoplayStreak(); - res.send(200); + User.findOne({ + id: req.session.passport ? req.session.passport.user : null + }).then(user => { + YouTubeService.getPlaylistVideos(params.playlistId, params.user || 'Anonymous', user ? user.name : null).then(SyncService.addPlaylist).then(SyncService.sendPlaylistAddMessages).then(function(video) { + SyncService.resetAutoplayStreak(); + res.send(200); + }); }).catch(function(err) { res.send(400, err); }); diff --git a/api/controllers/SlackController.js b/api/controllers/SlackController.js index 6844b57..74d19b9 100644 --- a/api/controllers/SlackController.js +++ b/api/controllers/SlackController.js @@ -17,7 +17,7 @@ module.exports = { switch (command) { case 'add': var key = YouTubeService.parseYouTubeLink(args[0]); - YouTubeService.getYouTubeVideo(key, '@' + params.user_name).then(SyncService.addVideo).then(SyncService.sendAddMessages).then(function(video) { + YouTubeService.getYouTubeVideo(key, '@' + params.user_name, null).then(SyncService.addVideo).then(SyncService.sendAddMessages).then(function(video) { res.send('Successfully added "' + video.title + '"'); }).catch(function(err) { res.send(err); diff --git a/api/services/SyncService.js b/api/services/SyncService.js index 5a0d591..078c517 100644 --- a/api/services/SyncService.js +++ b/api/services/SyncService.js @@ -148,7 +148,7 @@ function findNextVideo(lastVideo) { } else if (autoplay) { autoplayStreak++; YouTubeService.nextRelated(lastVideo.key).then(function(nextKey) { - return YouTubeService.getYouTubeVideo(nextKey, 'Autoplay'); + return YouTubeService.getYouTubeVideo(nextKey, 'Autoplay', null); }).then(addVideo).then(sendAddMessages); } }); diff --git a/api/services/YouTubeService.js b/api/services/YouTubeService.js index f8c2b4d..bb4bb34 100644 --- a/api/services/YouTubeService.js +++ b/api/services/YouTubeService.js @@ -28,12 +28,12 @@ function parseYouTubeLink(link) { return match[1] || match[2]; } -function getYouTubeVideo(key, user, canSave=true) { +function getYouTubeVideo(key, user, realuser, canSave=true) { return new Promise((resolve, reject) => { request(`https://www.googleapis.com/youtube/v3/videos?id=${key}&part=snippet,contentDetails&key=${process.env.GOOGLE_API_KEY}`, (error, response, body) => { if (!error && response.statusCode == 200) { try { - parseYouTubeVideo(JSON.parse(body), user, canSave).then((video, err) => { + parseYouTubeVideo(JSON.parse(body), user, realuser, canSave).then((video, err) => { if (err) { throw err; } @@ -50,7 +50,7 @@ function getYouTubeVideo(key, user, canSave=true) { }); } -function parseYouTubeVideo(data, user, canSave) { +function parseYouTubeVideo(data, user, realuser, canSave) { if (data.items.length != 1) { throw 'YouTube link did not match a video'; } @@ -59,6 +59,7 @@ function parseYouTubeVideo(data, user, canSave) { key: item.id, duration: moment.duration(item.contentDetails.duration).asMilliseconds(), user: user, + realuser: realuser, isSuggestion: canSave ? false : true, thumbnail: item.snippet.thumbnails ? item.snippet.thumbnails.default.url : null, title: item.snippet.title @@ -144,7 +145,7 @@ function relatedVideos(key, maxResults = 10) { } var itemsPromise = items.map((i) => { - return getYouTubeVideo(i.id.videoId, 'JukeBot', false); + return getYouTubeVideo(i.id.videoId, 'JukeBot', null, false); }); return Promise.all(itemsPromise) @@ -158,10 +159,10 @@ function relatedVideos(key, maxResults = 10) { }); } -function getPlaylistVideos(playlistId, user) { +function getPlaylistVideos(playlistId, user, realuser) { return getPlaylistVideosRecursive(playlistId, [], '').then(videos => { return Promise.all(videos.map(function(video) { - return getYouTubeVideo(video.snippet.resourceId.videoId, user); + return getYouTubeVideo(video.snippet.resourceId.videoId, user, realuser); })); }); } diff --git a/assets/components/playlist-item.html b/assets/components/playlist-item.html index 3a5838d..f7aa439 100644 --- a/assets/components/playlist-item.html +++ b/assets/components/playlist-item.html @@ -7,7 +7,7 @@
- Added by {{$ctrl.video.user}} + Added by {{$ctrl.video.user}}
({{$ctrl.formatDuration()}})
diff --git a/views/partials/currently-playing.ejs b/views/partials/currently-playing.ejs index fe0dc7b..2c2bfc3 100644 --- a/views/partials/currently-playing.ejs +++ b/views/partials/currently-playing.ejs @@ -20,7 +20,7 @@ {{currentVideo().title}}
- Added by {{currentVideo().user}} + Added by {{currentVideo().user}}
From 0131379271eaca9a46012c47b95a946fdc83b784 Mon Sep 17 00:00:00 2001 From: TheConnMan Date: Fri, 5 May 2017 11:34:37 -0400 Subject: [PATCH 11/35] Run Docker container with NPM so version number is injected Closes #189 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index b784aff..9d295d7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -11,4 +11,4 @@ COPY . /usr/src/app EXPOSE 1337 -CMD if [[ -z "${MYSQL_HOST}" ]]; then npm start; else npm run migrate && node app.js; fi +CMD if [[ -z "${MYSQL_HOST}" ]]; then npm start; else npm run migrate && npm start; fi From 4b2b33bdd50235fa65df755174bdc4a7cf2d1ca1 Mon Sep 17 00:00:00 2001 From: TheConnMan Date: Fri, 5 May 2017 11:45:49 -0400 Subject: [PATCH 12/35] Better handle logout events --- api/controllers/ApiController.js | 2 +- api/controllers/ChatController.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/api/controllers/ApiController.js b/api/controllers/ApiController.js index 480181d..ced77c6 100644 --- a/api/controllers/ApiController.js +++ b/api/controllers/ApiController.js @@ -10,7 +10,7 @@ module.exports = { User.findOne({ id: req.session.passport.user }).then(user => { - subscribeUsers(req, res, user.name); + subscribeUsers(req, res, user ? user.name : null); }); } else { subscribeUsers(req, res, null); diff --git a/api/controllers/ChatController.js b/api/controllers/ChatController.js index 0aee4f8..94692eb 100644 --- a/api/controllers/ChatController.js +++ b/api/controllers/ChatController.js @@ -6,7 +6,7 @@ module.exports = { User.findOne({ id: req.session.passport.user }).then(user => { - subscribe(req, res, user.name); + subscribe(req, res, user ? user.name : null); }); } else { subscribe(req, res, null); From a94abf22bb1eac927a3a342c2797d765b9af12f2 Mon Sep 17 00:00:00 2001 From: TheConnMan Date: Fri, 5 May 2017 11:50:22 -0400 Subject: [PATCH 13/35] Delimit listener list by commas without CSS --- assets/styles/jukebot.css | 4 ---- views/partials/currently-playing.ejs | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/assets/styles/jukebot.css b/assets/styles/jukebot.css index a8131fa..9557f89 100644 --- a/assets/styles/jukebot.css +++ b/assets/styles/jukebot.css @@ -1,9 +1,5 @@ /* JukeBot Styles */ -.listeners span + span:before { - content: ', '; -} - #video-list { height: calc(100vh - 130px); overflow-y: auto; diff --git a/views/partials/currently-playing.ejs b/views/partials/currently-playing.ejs index 2c2bfc3..6e32632 100644 --- a/views/partials/currently-playing.ejs +++ b/views/partials/currently-playing.ejs @@ -46,7 +46,7 @@
- {{user.username}} + {{user.username}}{{$last ? '' : ', '}}
From c91d90264b6a43006d7504b5733e153f01802a19 Mon Sep 17 00:00:00 2001 From: TheConnMan Date: Wed, 3 May 2017 18:52:26 -0400 Subject: [PATCH 14/35] Add user property controller --- api/controllers/ProfileController.js | 53 ++++++++++++++++++++++++++++ api/policies/isAuthenticated.js | 7 ++++ config/policies.js | 4 +++ 3 files changed, 64 insertions(+) create mode 100644 api/controllers/ProfileController.js create mode 100644 api/policies/isAuthenticated.js diff --git a/api/controllers/ProfileController.js b/api/controllers/ProfileController.js new file mode 100644 index 0000000..f3a4335 --- /dev/null +++ b/api/controllers/ProfileController.js @@ -0,0 +1,53 @@ +module.exports = { + + get: function(req, res) { + return User.findOne({ + id: req.session.passport.user + }) + .then(user => { + if (user) { + return res.ok(user.properties); + } else { + return res.notFound(); + } + }); + }, + + add: function(req, res) { + return User.findOne({ + id: req.session.passport.user + }) + .then(user => { + if (user) { + var body = req.body || {}; + Object.keys(body).forEach(key => { + user.properties[key] = body[key]; + }); + return user.save().then(() => { + return res.ok(user.properties); + }); + } else { + return res.notFound(); + } + }); + }, + + remove: function(req, res) { + return User.findOne({ + id: req.session.passport.user + }) + .then(user => { + if (user) { + var body = req.body || []; + body.forEach(key => { + delete user.properties[key]; + }); + return user.save().then(() => { + return res.ok(user.properties); + }); + } else { + return res.notFound(); + } + }); + } +}; diff --git a/api/policies/isAuthenticated.js b/api/policies/isAuthenticated.js new file mode 100644 index 0000000..e38a547 --- /dev/null +++ b/api/policies/isAuthenticated.js @@ -0,0 +1,7 @@ +module.exports = function(req, res, next) { + if (req.isAuthenticated()) { + return next(); + } else { + return res.send(401); + } +}; diff --git a/config/policies.js b/config/policies.js index 3ae3aff..876f077 100644 --- a/config/policies.js +++ b/config/policies.js @@ -1,4 +1,8 @@ module.exports.policies = { '*': true, + + 'ProfileController': { + '*': 'isAuthenticated' + } }; From 52db2aa174de65a422ad6f9820a9c7ba6efa6790 Mon Sep 17 00:00:00 2001 From: TheConnMan Date: Sat, 13 May 2017 12:50:26 -0400 Subject: [PATCH 15/35] Add persisted profile settings --- assets/components/playlist.html | 2 - assets/js/app.js | 32 +++++----------- assets/js/components/chat.js | 27 +++++--------- assets/js/components/playlist-item.js | 9 ++--- assets/js/components/playlist.js | 15 +------- assets/js/profile.js | 54 +++++++++++++++++++++++++++ assets/js/video.js | 6 +-- views/layout.ejs | 9 ++++- views/partials/currently-playing.ejs | 2 +- views/partials/header.ejs | 4 +- 10 files changed, 93 insertions(+), 67 deletions(-) create mode 100644 assets/js/profile.js diff --git a/assets/components/playlist.html b/assets/components/playlist.html index 23b7f90..00338d5 100644 --- a/assets/components/playlist.html +++ b/assets/components/playlist.html @@ -24,7 +24,6 @@
= new Date(Date.now() - chatHistory * 60 * 1000); }); }; - this.getUsername = function() { - return self.username || 'Anonymous'; - }; - this.showUsername = function(index) { let isFirst = index === 0; if (isFirst) { @@ -45,7 +41,7 @@ function ChatController($rootScope, $scope, $http, $notification, $storage, $vid this.sendChat = function() { io.socket._raw.emit('chat', { message: this.newChat, - username: this.getUsername(), + username: $rootScope.profile.username, type: 'user', time: Date.now() }); @@ -79,8 +75,8 @@ function ChatController($rootScope, $scope, $http, $notification, $storage, $vid io.socket.on('chat', (c) => { this.chats.push(c); - if (c.username !== this.getUsername() && this.notifications && c.type !== 'addVideo' && c.type !== 'videoSkipped' && c.type !== 'videoPlaying') { - let notification = $notification(c.username || 'JukeBot', { + if (c.username !== $rootScope.profile.username && this.notifications && c.type !== 'addVideo' && c.type !== 'videoSkipped' && c.type !== 'videoPlaying') { + let notification = $notification(c.username || 'Anonymous', { body: c.message, delay: 4000, icon: '/images/jukebot-72.png', @@ -100,15 +96,15 @@ function ChatController($rootScope, $scope, $http, $notification, $storage, $vid accuracy: 'exactly', className: 'highlight' }; - $('.chat > span').mark(self.getUsername(), markOptions); - $('.chat > span').mark('@' + self.getUsername(), markOptions); + $('.chat > span').mark($rootScope.profile.username, markOptions); + $('.chat > span').mark('@' + $rootScope.profile.username, markOptions); $('.chat > span').mark('@here', markOptions); $('.chat > span').mark('@channel', markOptions); } io.socket.on('typers', (typers) => { - if (typers.indexOf(self.getUsername()) !== -1) { - typers.splice(typers.indexOf(self.getUsername()), 1); + if (typers.indexOf($rootScope.profile.username) !== -1) { + typers.splice(typers.indexOf($rootScope.profile.username), 1); } if (typers.length === 0) { self.typers = ''; @@ -125,7 +121,7 @@ function ChatController($rootScope, $scope, $http, $notification, $storage, $vid function typing(isTyping) { io.socket._raw.emit('typers', { typing: isTyping, - username: self.getUsername() + username: $rootScope.profile.username }); } @@ -141,8 +137,5 @@ angular .module('app') .component('chat', { templateUrl: 'components/chat.html', - controller: ChatController, - bindings: { - username: '=' - } + controller: ChatController }); diff --git a/assets/js/components/playlist-item.js b/assets/js/components/playlist-item.js index cbf6abe..aa5dec4 100644 --- a/assets/js/components/playlist-item.js +++ b/assets/js/components/playlist-item.js @@ -1,4 +1,4 @@ -function PlaylistItemController($scope, $http, $video, $storage) { +function PlaylistItemController($rootScope, $scope, $http, $video, $storage) { this.formatDuration = function() { return $video.formatDuration(this.video.duration); }; @@ -12,15 +12,15 @@ function PlaylistItemController($scope, $http, $video, $storage) { }; this.skip = function() { - return $video.skip(this.username); + return $video.skip(); }; this.readd = function() { - return $video.addByKey(this.username, this.video.key); + return $video.addByKey($rootScope.profile.username, this.video.key); }; this.remove = function() { - return $video.removePermanently(this.username, this.video.id); + return $video.removePermanently($rootScope.profile.username, this.video.id); }; this.likeVideo = function() { @@ -44,7 +44,6 @@ angular controller: PlaylistItemController, bindings: { video: '<', - username: '<', showAddedBy: '<', showExpectedPlaytime: '<', isSuggestion: '<', diff --git a/assets/js/components/playlist.js b/assets/js/components/playlist.js index 43a9842..0772ce3 100644 --- a/assets/js/components/playlist.js +++ b/assets/js/components/playlist.js @@ -1,11 +1,8 @@ function PlaylistController($rootScope, $scope, $video, $storage, $log, $notification) { let self = this; - self.notifications = $storage.get('notifications') === 'true' || !$storage.get('notifications'); self.activeTab = 'up-next'; self.relatedVideos = []; - $rootScope.notifications = self.notifications; - $video.getAll().then(function() { setTimeout(function() { self.scrollToCurrentlyPlaying(); @@ -17,7 +14,7 @@ function PlaylistController($rootScope, $scope, $video, $storage, $log, $notific $log.log('Received a video update'); $log.log(obj); if (obj.verb === 'created') { - if ($video.current() && $scope.username !== obj.data.user && self.notifications) { + if ($video.current() && $rootScope.profile.username !== obj.data.user && $rootScope.profile.videoNotifications) { $notification('New Video Added', { body: obj.data.user + ' added ' + obj.data.title, icon: obj.data.thumbnail, @@ -44,11 +41,6 @@ function PlaylistController($rootScope, $scope, $video, $storage, $log, $notific return $video.getVideos(); }; - this.toggleNotifications = function(newVal) { - $storage.set('notifications', newVal); - $rootScope.notifications = newVal; - }; - this.scrollToCurrentlyPlaying = function() { let $list = $('#video-list'); let $playing = $list.find('.yellow').closest('playlistitem'); @@ -71,8 +63,5 @@ angular .module('app') .component('playlist', { templateUrl: 'components/playlist.html', - controller: PlaylistController, - bindings: { - username: '=' - } + controller: PlaylistController }); diff --git a/assets/js/profile.js b/assets/js/profile.js new file mode 100644 index 0000000..e172023 --- /dev/null +++ b/assets/js/profile.js @@ -0,0 +1,54 @@ +angular +.module('profile', []) +.factory('$profile', ['$rootScope', '$http', '$storage', function($rootScope, $http, $storage) { + + $rootScope.profile = { + username: $storage.get('username'), + theme: $storage.get('theme'), + minimizeVideo: $storage.get('minimizeVideo') === 'true', + videoNotifications: $storage.get('videoNotifications') === 'true' || !$storage.get('videoNotifications'), + chatNotifications: $storage.get('chatNotifications') === 'true' || !$storage.get('chatNotifications') + }; + + $rootScope.$watch('profile.username', function() { + persistProperty('username', $rootScope.profile.username); + }); + + $rootScope.$watch('profile.theme', function() { + persistProperty('theme', $rootScope.profile.theme); + }); + + $rootScope.$watch('profile.minimizeVideo', function() { + persistProperty('minimizeVideo', $rootScope.profile.minimizeVideo); + }); + + $rootScope.$watch('profile.videoNotifications', function() { + persistProperty('videoNotifications', $rootScope.profile.videoNotifications); + }); + + $rootScope.$watch('profile.chatNotifications', function() { + persistProperty('chatNotifications', $rootScope.profile.chatNotifications); + }); + + if (loggedIn) { + $http.get('/profile/get').then(({ data }) => { + Object.keys(data).forEach(key => { + $rootScope.profile[key] = data[key]; + }); + persistProperties(); + }); + } + + function persistProperty(key, value) { + $storage.set(key, value); + var payload = {}; + payload[key] = value; + return loggedIn ? $http.post('/profile/add', payload) : Promise.resolve(); + } + + function persistProperties() { + return loggedIn ? $http.post('/profile/add', $rootScope.profile) : Promise.resolve(); + } + + return {}; +}]); diff --git a/assets/js/video.js b/assets/js/video.js index 44dc897..d8651e7 100644 --- a/assets/js/video.js +++ b/assets/js/video.js @@ -1,6 +1,6 @@ angular .module('video', []) -.factory('$video', ['$http', '$log', function($http, $log) { +.factory('$video', ['$rootScope', '$http', '$log', function($rootScope, $http, $log) { var videos = []; const YOUTUBE_URL = 'https://www.youtube.com/watch?v='; @@ -44,9 +44,9 @@ angular }); } - function skip(username) { + function skip() { return $http.post('/api/skip', { - username + username: $rootScope.profile.username }); } diff --git a/views/layout.ejs b/views/layout.ejs index 4b43a9c..b05c233 100644 --- a/views/layout.ejs +++ b/views/layout.ejs @@ -31,7 +31,7 @@ - +
<%- body -%>
@@ -47,8 +47,13 @@ + + + @@ -56,7 +61,7 @@ - + diff --git a/views/partials/currently-playing.ejs b/views/partials/currently-playing.ejs index 6e32632..22a4d2b 100644 --- a/views/partials/currently-playing.ejs +++ b/views/partials/currently-playing.ejs @@ -8,7 +8,7 @@ class="big heart {{likesCurrentVideo() ? 'red' : 'outline'}} like icon">
- +
diff --git a/views/partials/header.ejs b/views/partials/header.ejs index 415a269..eda0071 100644 --- a/views/partials/header.ejs +++ b/views/partials/header.ejs @@ -14,7 +14,7 @@
- +
@@ -29,7 +29,7 @@
- +
Theme
Default
From cb665d649d1057a06c256486e2312e7eb23906bc Mon Sep 17 00:00:00 2001 From: TheConnMan Date: Sat, 13 May 2017 13:39:10 -0400 Subject: [PATCH 16/35] Persist notification properties in user properties --- assets/components/chat.html | 3 +-- assets/components/playlist.html | 3 +-- assets/js/components/chat.js | 7 +------ 3 files changed, 3 insertions(+), 10 deletions(-) diff --git a/assets/components/chat.html b/assets/components/chat.html index 8d6177c..d596d93 100644 --- a/assets/components/chat.html +++ b/assets/components/chat.html @@ -3,8 +3,7 @@

Chat
diff --git a/assets/components/playlist.html b/assets/components/playlist.html index 00338d5..bd60086 100644 --- a/assets/components/playlist.html +++ b/assets/components/playlist.html @@ -7,8 +7,7 @@
diff --git a/assets/js/components/chat.js b/assets/js/components/chat.js index 5b9235f..bd46cdf 100644 --- a/assets/js/components/chat.js +++ b/assets/js/components/chat.js @@ -16,7 +16,6 @@ function ChatController($rootScope, $scope, $http, $notification, $storage, $vid this.chats = []; this.newChat = ''; this.typers = ''; - this.notifications = $storage.get('chat-notifications') === 'true' || !$storage.get('chat-notifications'); this.getChats = function() { return this.chats.filter(function(chat) { return new Date(chat.createdAt) >= new Date(Date.now() - chatHistory * 60 * 1000); }); @@ -34,10 +33,6 @@ function ChatController($rootScope, $scope, $http, $notification, $storage, $vid return (!recentPreviousMessage || differentUser || differentChatType) && !bothMachineChat; }; - this.toggleChat = function(newVal) { - $storage.set('chat-notifications', newVal); - }; - this.sendChat = function() { io.socket._raw.emit('chat', { message: this.newChat, @@ -75,7 +70,7 @@ function ChatController($rootScope, $scope, $http, $notification, $storage, $vid io.socket.on('chat', (c) => { this.chats.push(c); - if (c.username !== $rootScope.profile.username && this.notifications && c.type !== 'addVideo' && c.type !== 'videoSkipped' && c.type !== 'videoPlaying') { + if (c.username !== $rootScope.profile.username && $rootScope.profile.chatNotifications && c.type !== 'addVideo' && c.type !== 'videoSkipped' && c.type !== 'videoPlaying') { let notification = $notification(c.username || 'Anonymous', { body: c.message, delay: 4000, From 54e8d2219f43881502fe6e9340bf85ddeaa78a21 Mon Sep 17 00:00:00 2001 From: TheConnMan Date: Sun, 14 May 2017 20:39:09 -0400 Subject: [PATCH 17/35] Default username to Anonymous when favoriting --- assets/js/app.js | 3 --- assets/js/components/chat.js | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/assets/js/app.js b/assets/js/app.js index bf20dad..eedf11d 100644 --- a/assets/js/app.js +++ b/assets/js/app.js @@ -76,9 +76,6 @@ app.controller('controller', function($scope, $rootScope, $notification, $storag }; $scope.addVideo = function() { - $log.log('Adding video'); - $log.log($scope.link); - $log.log($rootScope.profile.username); if ($scope.link) { $video .add(link, user) diff --git a/assets/js/components/chat.js b/assets/js/components/chat.js index bd46cdf..733d124 100644 --- a/assets/js/components/chat.js +++ b/assets/js/components/chat.js @@ -6,7 +6,7 @@ function ChatController($rootScope, $scope, $http, $notification, $storage, $vid $rootScope.$on('likeVideo', function(e, args) { io.socket._raw.emit('chat', { - message: $rootScope.profile.username + ' favorited ' + args.video.title, + message: ($rootScope.profile.username || 'Anonymous') + ' favorited ' + args.video.title, type: 'favorite', time: Date.now(), data: args.video.key From 39f859881ea69cf36adbc625be9d939a3c324b41 Mon Sep 17 00:00:00 2001 From: TheConnMan Date: Sun, 14 May 2017 20:52:25 -0400 Subject: [PATCH 18/35] Update Travis build to build feature branches --- .travis.yml | 38 +++++++++++++------------------------- travis-build.sh | 19 +++++++++++++++++++ 2 files changed, 32 insertions(+), 25 deletions(-) create mode 100644 travis-build.sh diff --git a/.travis.yml b/.travis.yml index c04a9a5..28c5d47 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,25 +1,13 @@ -sudo: required - -language: node_js -node_js: - - "6" - -services: - - docker - -script: - - docker build -t theconnman/jukebot . - -after_success: - - docker login -u="$DOCKER_USERNAME" -p="$DOCKER_PASSWORD"; - VERSION=`node -e "console.log(require('./package.json').version);"`; - if [ "$TRAVIS_BRANCH" == "master" ]; then - docker tag theconnman/jukebot theconnman/jukebot:$VERSION; - docker push theconnman/jukebot:latest; - docker push theconnman/jukebot:$VERSION; - elif [ "$TRAVIS_BRANCH" == "dev" ]; then - sed -i "s/$VERSION/$VERSION-dev/g" package.json; - docker build -t theconnman/jukebot .; - docker tag theconnman/jukebot theconnman/jukebot:latest-dev; - docker push theconnman/jukebot:latest-dev; - fi +sudo: required + +language: node_js +node_js: + - "6" + +install: true + +services: + - docker + +script: + - chmod a+x travis-build.sh && ./travis-build.sh diff --git a/travis-build.sh b/travis-build.sh new file mode 100644 index 0000000..5432e18 --- /dev/null +++ b/travis-build.sh @@ -0,0 +1,19 @@ +docker login -u="$DOCKER_USERNAME" -p="$DOCKER_PASSWORD"; +VERSION=`node -e "console.log(require('./package.json').version);"`; +if [ "$TRAVIS_BRANCH" == "dev" ]; then + sed -i "s/$VERSION/$VERSION-dev/g" package.json; +elif [ "$TRAVIS_BRANCH" != "master" ] && [ "$TRAVIS_BRANCH" != "dev" ]; then + sed -i "s/$VERSION/$VERSION-${TRAVIS_BRANCH#*/}/g" package.json; +fi +docker build -t theconnman/jukebot .; +if [ "$TRAVIS_BRANCH" == "master" ]; then + docker tag theconnman/jukebot theconnman/jukebot:$VERSION; + docker push theconnman/jukebot:latest; + docker push theconnman/jukebot:$VERSION; +elif [ "$TRAVIS_BRANCH" == "dev" ]; then + docker tag theconnman/jukebot theconnman/jukebot:latest-dev; + docker push theconnman/jukebot:latest-dev; +else + docker tag theconnman/jukebot theconnman/jukebot:${TRAVIS_BRANCH#*/}; + docker push theconnman/jukebot:${TRAVIS_BRANCH#*/}; +fi From a397b06db21ef4c0b1fd63aee6be2807dc9df4fc Mon Sep 17 00:00:00 2001 From: TheConnMan Date: Sun, 14 May 2017 13:35:01 -0400 Subject: [PATCH 19/35] Add Favorites domain object --- api/models/Favorite.js | 9 +++++ migrations/20170514005652-favorites.js | 54 ++++++++++++++++++++++++++ 2 files changed, 63 insertions(+) create mode 100644 api/models/Favorite.js create mode 100644 migrations/20170514005652-favorites.js diff --git a/api/models/Favorite.js b/api/models/Favorite.js new file mode 100644 index 0000000..944089b --- /dev/null +++ b/api/models/Favorite.js @@ -0,0 +1,9 @@ +module.exports = { + + attributes: { + key : 'String', + title : 'String', + + user: { model: 'user' } + } +}; diff --git a/migrations/20170514005652-favorites.js b/migrations/20170514005652-favorites.js new file mode 100644 index 0000000..8549640 --- /dev/null +++ b/migrations/20170514005652-favorites.js @@ -0,0 +1,54 @@ +'use strict'; + +var dbm; +var type; +var seed; + +/** + * We receive the dbmigrate dependency from dbmigrate initially. + * This enables us to not have to rely on NODE_PATH. + */ +exports.setup = function(options, seedLink) { + dbm = options.dbmigrate; + type = dbm.dataType; + seed = seedLink; +}; + +exports.up = function(db, callback) { + createFavorites(db).then(callback); +}; + +exports.down = function(db, callback) { + return db.dropTable('favorite', callback); +}; + +exports._meta = { + "version": 1 +}; + +function createFavorites(db) { + return new Promise((resolve, reject) => { + db.createTable('favorite', { + id: { + type: 'int', + primaryKey: true, + autoIncrement: true + }, + key: 'string', + title: 'string', + user: { + type: 'int', + foreignKey: { + name: 'favorite_user_id_fk', + table: 'user', + rules: { + onDelete: 'CASCADE' + }, + mapping: 'id' + } + }, + createdAt: 'datetime', + updatedAt: 'datetime' + }, resolve); + }); +} From 9de1d8a2527e2e464a289ebad98ec93e3bd24807 Mon Sep 17 00:00:00 2001 From: TheConnMan Date: Sun, 14 May 2017 13:36:36 -0400 Subject: [PATCH 20/35] Add Favorites controller --- api/controllers/FavoriteController.js | 57 +++++++++++++++++++++++++++ config/policies.js | 4 ++ 2 files changed, 61 insertions(+) create mode 100644 api/controllers/FavoriteController.js diff --git a/api/controllers/FavoriteController.js b/api/controllers/FavoriteController.js new file mode 100644 index 0000000..e8256c8 --- /dev/null +++ b/api/controllers/FavoriteController.js @@ -0,0 +1,57 @@ +module.exports = { + + find: function(req, res) { + return Favorite.find({ + user: req.session.passport.user + }) + .then(favorites => { + return res.ok(favorites); + }); + }, + + findOne: function(req, res) { + return Favorite.findOne({ + id: req.params.id, + user: req.session.passport.user + }) + .then(favorite => { + if (favorite) { + return res.ok(favorite); + } else { + return res.notFound(); + } + }); + }, + + create: function(req, res) { + var body = req.body || {}; + return Favorite.create({ + key: body.key, + title: body.title, + user: req.session.passport.user + }).then(favorite => { + return res.ok(favorite); + }).catch(err => { + return res.badRequest('Invalid favorite attributes: ' + Object.keys(err.invalidAttributes).join(', ')); + }); + }, + + update: function(req, res) { + return res.badRequest('Favorites can not be updated'); + }, + + destroy: function(req, res) { + return Favorite.findOne({ + key: req.params.id, + user: req.session.passport.user + }).then(favorite => { + if (favorite) { + return favorite.destroy().then(() => { + return res.ok(favorite); + }); + } else { + return res.notFound(); + } + }); + } +}; diff --git a/config/policies.js b/config/policies.js index 876f077..c9a2bbb 100644 --- a/config/policies.js +++ b/config/policies.js @@ -2,6 +2,10 @@ module.exports.policies = { '*': true, + 'FavoriteController': { + '*': 'isAuthenticated' + }, + 'ProfileController': { '*': 'isAuthenticated' } From 5b7a25e3faf39c398df2e0c78bda04e31ac25f3b Mon Sep 17 00:00:00 2001 From: TheConnMan Date: Sun, 14 May 2017 14:12:12 -0400 Subject: [PATCH 21/35] Move UI favoriting to separate component to sync with the server --- assets/js/app.js | 14 ++++----- assets/js/components/heart.js | 6 ++-- assets/js/components/playlist-item.js | 4 +-- assets/js/favorites.js | 42 +++++++++++++++++++++++++++ assets/js/storage.js | 33 --------------------- views/layout.ejs | 1 + views/partials/favorites.ejs | 2 +- 7 files changed, 54 insertions(+), 48 deletions(-) create mode 100644 assets/js/favorites.js diff --git a/assets/js/app.js b/assets/js/app.js index eedf11d..96d9a14 100644 --- a/assets/js/app.js +++ b/assets/js/app.js @@ -1,5 +1,5 @@ -var app = angular.module('app', ['notification', 'storage', 'profile', 'video', 'angularMoment', 'ngSanitize']); -app.controller('controller', function($scope, $rootScope, $notification, $storage, $profile, $video, $timeout, $http, $log) { +var app = angular.module('app', ['notification', 'storage', 'profile', 'favorites', 'video', 'angularMoment', 'ngSanitize']); +app.controller('controller', function($scope, $rootScope, $notification, $storage, $profile, $favorites, $video, $timeout, $http, $log) { $('.ui.search') .search({ minCharacters: 3, @@ -45,7 +45,7 @@ app.controller('controller', function($scope, $rootScope, $notification, $storag *************/ $scope.likeCurrentVideo = function() { let video = $video.current(); - $storage.likeVideo(video); + $favorites.likeVideo(video); if ($scope.likesCurrentVideo()) { $scope.$emit('likeVideo', { video @@ -54,15 +54,11 @@ app.controller('controller', function($scope, $rootScope, $notification, $storag }; $scope.likesCurrentVideo = function() { - return $storage.likesVideo($video.current().key); + return $favorites.likesVideo($video.current().key); }; $scope.likeVideo = function(video) { - return $storage.likeVideo(video); - }; - - $scope.likes = function() { - return $storage.getLikedVideos(); + return $favorites.likeVideo(video); }; /***************** * End Favorites * diff --git a/assets/js/components/heart.js b/assets/js/components/heart.js index 2cfb4ac..966bd17 100644 --- a/assets/js/components/heart.js +++ b/assets/js/components/heart.js @@ -1,7 +1,7 @@ -function HeartController($scope, $storage) { +function HeartController($scope, $favorites) { this.likeVideo = function(video) { - $storage.likeVideo(video); + $favorites.likeVideo(video); if (this.likesVideo(video.key)) { $scope.$emit('likeVideo', { video @@ -10,7 +10,7 @@ function HeartController($scope, $storage) { }; this.likesVideo = function(key) { - return $storage.likesVideo(key); + return $favorites.likesVideo(key); }; } diff --git a/assets/js/components/playlist-item.js b/assets/js/components/playlist-item.js index aa5dec4..e21db0e 100644 --- a/assets/js/components/playlist-item.js +++ b/assets/js/components/playlist-item.js @@ -1,4 +1,4 @@ -function PlaylistItemController($rootScope, $scope, $http, $video, $storage) { +function PlaylistItemController($rootScope, $scope, $http, $video, $favorites) { this.formatDuration = function() { return $video.formatDuration(this.video.duration); }; @@ -24,7 +24,7 @@ function PlaylistItemController($rootScope, $scope, $http, $video, $storage) { }; this.likeVideo = function() { - $storage.likeVideo(this.video); + $favorites.likeVideo(this.video); if (this.likesVideo(this.video.key)) { $scope.$emit('likeVideo', { video: this.video diff --git a/assets/js/favorites.js b/assets/js/favorites.js new file mode 100644 index 0000000..7feae72 --- /dev/null +++ b/assets/js/favorites.js @@ -0,0 +1,42 @@ +angular +.module('favorites', []) +.factory('$favorites', ['$rootScope', '$http', '$storage', function($rootScope, $http, $storage) { + + $rootScope.favorites = JSON.parse($storage.get('likes') || '[]'); + + if (loggedIn) { + $http.get('/favorite').then(({ data }) => { + let localFavorites = $rootScope.favorites; + $rootScope.favorites = data; + localFavorites.forEach(favorite => { + if (!data.find(l => l.key === favorite.key)) { + likeVideo(favorite); + } + }); + }); + } + + function likeVideo(video) { + let key = video.key; + + let found = $rootScope.favorites.find((l) => l.key === key); + + if (found) { + let index = $rootScope.favorites.indexOf(found); + + $rootScope.favorites.splice(index, 1); + } else { + $rootScope.favorites.push(video); + } + $storage.set('likes', JSON.stringify($rootScope.favorites)); + return loggedIn ? (found ? $http.delete('/favorite/' + key) : $http.post('/favorite', video)) : Promise.resolve(); + } + + return { + likeVideo, + + likesVideo(videoKey) { + return !!$rootScope.favorites.find((l) => l.key === videoKey); + } + }; +}]); diff --git a/assets/js/storage.js b/assets/js/storage.js index daff979..0fa487e 100644 --- a/assets/js/storage.js +++ b/assets/js/storage.js @@ -1,7 +1,6 @@ angular .module('storage', []) .factory('$storage', function() { - var likedVideos = getObj('likes'); function getObj(key) { try { @@ -24,38 +23,6 @@ angular localStorage[key] = value; }, - likeVideo(video) { - let likes = likedVideos; - let key = video.key; - - if (likes) { - let found = likes.find((l) => l.key === key); - - if (found) { - let index = likes.indexOf(found); - - likes.splice(index, 1); - } else { - likes.push(video); - } - setObj('likes', likes); - likedVideos = likes; - } else { - setObj('likes', [video]); - likedVideos = likes; - } - }, - - likesVideo(videoKey) { - let likes = likedVideos; - - if (likes) { - return !!likes.find((l) => l.key === videoKey); - } else { - return false; - } - }, - getLikedVideos() { return likedVideos; } diff --git a/views/layout.ejs b/views/layout.ejs index b05c233..cd691d0 100644 --- a/views/layout.ejs +++ b/views/layout.ejs @@ -54,6 +54,7 @@ + diff --git a/views/partials/favorites.ejs b/views/partials/favorites.ejs index 63d3270..ff870b4 100644 --- a/views/partials/favorites.ejs +++ b/views/partials/favorites.ejs @@ -1,6 +1,6 @@
Favorites -
+
{{video.title}} From f5674339b04cc2c56a0afeed4473bd6bd836ea9b Mon Sep 17 00:00:00 2001 From: TheConnMan Date: Wed, 17 May 2017 15:52:12 -0400 Subject: [PATCH 22/35] Actually minimze video when minimize is set Closes #192 --- views/partials/currently-playing.ejs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/views/partials/currently-playing.ejs b/views/partials/currently-playing.ejs index 22a4d2b..5c63e4f 100644 --- a/views/partials/currently-playing.ejs +++ b/views/partials/currently-playing.ejs @@ -1,5 +1,5 @@
-
+
Date: Wed, 17 May 2017 15:56:40 -0400 Subject: [PATCH 23/35] Widen favorites side bar --- assets/styles/jukebot.css | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/assets/styles/jukebot.css b/assets/styles/jukebot.css index 9557f89..c9e5523 100644 --- a/assets/styles/jukebot.css +++ b/assets/styles/jukebot.css @@ -57,6 +57,10 @@ input { left: 100%; } +.ui.left.sidebar, .ui.right.sidebar { + width: 500px!important; +} + .d-f { display: flex; } From 048c91bfb62430a1064db6c16b89a6429e5933b2 Mon Sep 17 00:00:00 2001 From: TheConnMan Date: Wed, 17 May 2017 16:23:24 -0400 Subject: [PATCH 24/35] Add a filter input for favorites Ref #81 --- assets/js/app.js | 8 ++++++++ assets/styles/jukebot.css | 6 +++++- views/partials/favorites.ejs | 7 ++++++- 3 files changed, 19 insertions(+), 2 deletions(-) diff --git a/assets/js/app.js b/assets/js/app.js index 96d9a14..615eeb1 100644 --- a/assets/js/app.js +++ b/assets/js/app.js @@ -60,6 +60,14 @@ app.controller('controller', function($scope, $rootScope, $notification, $storag $scope.likeVideo = function(video) { return $favorites.likeVideo(video); }; + + $scope.getFavorites = function() { + return $rootScope.favorites.filter(favorite => !$scope.favoriteFilter || favorite.title.toLowerCase().indexOf($scope.favoriteFilter.toLowerCase()) !== -1); + }; + + $scope.clearFavoritesFilter = function() { + $scope.favoriteFilter = ''; + }; /***************** * End Favorites * *****************/ diff --git a/assets/styles/jukebot.css b/assets/styles/jukebot.css index c9e5523..10c9c11 100644 --- a/assets/styles/jukebot.css +++ b/assets/styles/jukebot.css @@ -16,10 +16,14 @@ top: 6px; } -input { +input, .ui.action.input > .button, .ui.action.input > .buttons > .button { height: 34px!important; } +.ui.favorites input, .ui.favorites .action > .button { + border-radius: 0!important; +} + .highlight { background-color: #fff3b8; } diff --git a/views/partials/favorites.ejs b/views/partials/favorites.ejs index ff870b4..7ceebe9 100644 --- a/views/partials/favorites.ejs +++ b/views/partials/favorites.ejs @@ -1,6 +1,11 @@
Favorites -
+
+ + +
Clear
+
+
{{video.title}} From 619f75f2ce7c5812c7fe98f620903635cb122f7f Mon Sep 17 00:00:00 2001 From: TheConnMan Date: Wed, 17 May 2017 16:30:12 -0400 Subject: [PATCH 25/35] Default usernames to Anonymous --- assets/js/profile.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/js/profile.js b/assets/js/profile.js index e172023..24f23ef 100644 --- a/assets/js/profile.js +++ b/assets/js/profile.js @@ -3,7 +3,7 @@ angular .factory('$profile', ['$rootScope', '$http', '$storage', function($rootScope, $http, $storage) { $rootScope.profile = { - username: $storage.get('username'), + username: $storage.get('username') || 'Anonymous', theme: $storage.get('theme'), minimizeVideo: $storage.get('minimizeVideo') === 'true', videoNotifications: $storage.get('videoNotifications') === 'true' || !$storage.get('videoNotifications'), From 03ee5ae66086f927cad41a25e3eeacab4825e195 Mon Sep 17 00:00:00 2001 From: TheConnMan Date: Wed, 17 May 2017 16:52:14 -0400 Subject: [PATCH 26/35] Don't send empty chats --- assets/js/components/chat.js | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/assets/js/components/chat.js b/assets/js/components/chat.js index 733d124..fa5a126 100644 --- a/assets/js/components/chat.js +++ b/assets/js/components/chat.js @@ -34,15 +34,17 @@ function ChatController($rootScope, $scope, $http, $notification, $storage, $vid }; this.sendChat = function() { - io.socket._raw.emit('chat', { - message: this.newChat, - username: $rootScope.profile.username, - type: 'user', - time: Date.now() - }); - $('#chat-input input').val(''); - this.newChat = ''; - typing(false); + if (this.newChat) { + io.socket._raw.emit('chat', { + message: this.newChat, + username: $rootScope.profile.username, + type: 'user', + time: Date.now() + }); + $('#chat-input input').val(''); + this.newChat = ''; + typing(false); + } }; this.typingDebounce = function() { From bd0bed9d67b3d80b5a50f294ee80b6c5b7beac41 Mon Sep 17 00:00:00 2001 From: TheConnMan Date: Wed, 17 May 2017 18:26:15 -0400 Subject: [PATCH 27/35] Fix usernames on chat toggling in and out The filter function for checking if the username should be shown or not pulls chats by index to check them against their neighbors. The chats shown in the UI are pre-filtered by if they are within the last X hours (hide day old chats by default), so the $index coming off those pre-filtered chats was being passed into the filter function which was comparing chats by index against a chat array which wasn't filtered. This meant that as X 24 hour old chats fell out of view all the chat usernames were being shown based on whether the username should be shown of the chat X back, which in back-and-forth chat might look reasonable, but in large chunks of machine chat looks very odd. Closes #144 --- assets/js/components/chat.js | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/assets/js/components/chat.js b/assets/js/components/chat.js index fa5a126..390e4a4 100644 --- a/assets/js/components/chat.js +++ b/assets/js/components/chat.js @@ -22,14 +22,16 @@ function ChatController($rootScope, $scope, $http, $notification, $storage, $vid }; this.showUsername = function(index) { + var filteredChats = this.getChats(); + let isFirst = index === 0; if (isFirst) { return true; } - let recentPreviousMessage = new Date(this.chats[index].time) - new Date(this.chats[index - 1].time) <= 3 * 60 * 1000; - let differentUser = this.chats[index].username !== this.chats[index - 1].username; - let differentChatType = this.chats[index].type !== this.chats[index - 1].type; - let bothMachineChat = this.chats[index].type !== 'user' && this.chats[index - 1].type !== 'user'; + let recentPreviousMessage = new Date(filteredChats[index].time) - new Date(filteredChats[index - 1].time) <= 3 * 60 * 1000; + let differentUser = filteredChats[index].username !== filteredChats[index - 1].username; + let differentChatType = filteredChats[index].type !== filteredChats[index - 1].type; + let bothMachineChat = filteredChats[index].type !== 'user' && filteredChats[index - 1].type !== 'user'; return (!recentPreviousMessage || differentUser || differentChatType) && !bothMachineChat; }; From 8c3bc18de6ce75fed8513d6e46f6f85c4dcf0134 Mon Sep 17 00:00:00 2001 From: TheConnMan Date: Thu, 18 May 2017 08:41:36 -0400 Subject: [PATCH 28/35] Fix performance hit of recalculating all current chats for every chat --- assets/components/chat.html | 4 ++-- assets/js/components/chat.js | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/assets/components/chat.html b/assets/components/chat.html index d596d93..670cfe5 100644 --- a/assets/components/chat.html +++ b/assets/components/chat.html @@ -11,7 +11,7 @@

Chat

-
+
{{chat.type == 'user' ? chat.username : 'JukeBot'}} @@ -29,7 +29,7 @@

Chat

-
+
diff --git a/assets/js/components/chat.js b/assets/js/components/chat.js index 390e4a4..30437fe 100644 --- a/assets/js/components/chat.js +++ b/assets/js/components/chat.js @@ -21,17 +21,17 @@ function ChatController($rootScope, $scope, $http, $notification, $storage, $vid return this.chats.filter(function(chat) { return new Date(chat.createdAt) >= new Date(Date.now() - chatHistory * 60 * 1000); }); }; - this.showUsername = function(index) { - var filteredChats = this.getChats(); + this.showUsername = function(chat) { + var index = this.chats.indexOf(chat); let isFirst = index === 0; if (isFirst) { return true; } - let recentPreviousMessage = new Date(filteredChats[index].time) - new Date(filteredChats[index - 1].time) <= 3 * 60 * 1000; - let differentUser = filteredChats[index].username !== filteredChats[index - 1].username; - let differentChatType = filteredChats[index].type !== filteredChats[index - 1].type; - let bothMachineChat = filteredChats[index].type !== 'user' && filteredChats[index - 1].type !== 'user'; + let recentPreviousMessage = new Date(this.chats[index].time) - new Date(this.chats[index - 1].time) <= 3 * 60 * 1000; + let differentUser = this.chats[index].username !== this.chats[index - 1].username; + let differentChatType = this.chats[index].type !== this.chats[index - 1].type; + let bothMachineChat = this.chats[index].type !== 'user' && this.chats[index - 1].type !== 'user'; return (!recentPreviousMessage || differentUser || differentChatType) && !bothMachineChat; }; From 734015ff637b2fbab44e95be3807196bd8e6ac66 Mon Sep 17 00:00:00 2001 From: TheConnMan Date: Fri, 19 May 2017 15:00:51 -0400 Subject: [PATCH 29/35] Inject PNG, JPG, and GIF direct links into chat Closes #194 --- assets/components/chat.html | 2 ++ assets/js/components/chat.js | 7 +++++++ 2 files changed, 9 insertions(+) diff --git a/assets/components/chat.html b/assets/components/chat.html index 670cfe5..501f395 100644 --- a/assets/components/chat.html +++ b/assets/components/chat.html @@ -27,6 +27,7 @@

Chat +

@@ -38,6 +39,7 @@

Chat +

diff --git a/assets/js/components/chat.js b/assets/js/components/chat.js index 30437fe..8c31eb3 100644 --- a/assets/js/components/chat.js +++ b/assets/js/components/chat.js @@ -1,4 +1,7 @@ function ChatController($rootScope, $scope, $http, $notification, $storage, $video) { + + var urlRegex = /(\b(https?|ftp|file):\/\/[-A-Z0-9+&@#\/%?=~_|!:,.;]*[-A-Z0-9+&@#\/%=~_|])\.(gif|png|jpg)/ig; + let self = this; let timer = null; @@ -35,6 +38,10 @@ function ChatController($rootScope, $scope, $http, $notification, $storage, $vid return (!recentPreviousMessage || differentUser || differentChatType) && !bothMachineChat; }; + this.getImages = function(chat) { + return chat.message.match(urlRegex) || []; + }; + this.sendChat = function() { if (this.newChat) { io.socket._raw.emit('chat', { From 63a868c97fa6140aea110e50962e87583bcd659e Mon Sep 17 00:00:00 2001 From: TheConnMan Date: Fri, 19 May 2017 15:41:23 -0400 Subject: [PATCH 30/35] Add icon to furl/unfurl expanded images in chat Closes #197 --- assets/components/chat.html | 8 ++++++-- assets/js/components/chat.js | 4 ++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/assets/components/chat.html b/assets/components/chat.html index 501f395..fe5d0f5 100644 --- a/assets/components/chat.html +++ b/assets/components/chat.html @@ -27,7 +27,9 @@

Chat - + + +

@@ -39,7 +41,9 @@

Chat - + + +

diff --git a/assets/js/components/chat.js b/assets/js/components/chat.js index 8c31eb3..36ae5e1 100644 --- a/assets/js/components/chat.js +++ b/assets/js/components/chat.js @@ -42,6 +42,10 @@ function ChatController($rootScope, $scope, $http, $notification, $storage, $vid return chat.message.match(urlRegex) || []; }; + this.furlChat = function(chat, furled) { + chat.furled = furled; + }; + this.sendChat = function() { if (this.newChat) { io.socket._raw.emit('chat', { From d8ff24e70cc08de06e6d25fc3668268572be4942 Mon Sep 17 00:00:00 2001 From: TheConnMan Date: Sat, 20 May 2017 13:40:39 -0400 Subject: [PATCH 31/35] Show chat username between non-recent messages even from machines --- assets/js/components/chat.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/js/components/chat.js b/assets/js/components/chat.js index 36ae5e1..bf041db 100644 --- a/assets/js/components/chat.js +++ b/assets/js/components/chat.js @@ -35,7 +35,7 @@ function ChatController($rootScope, $scope, $http, $notification, $storage, $vid let differentUser = this.chats[index].username !== this.chats[index - 1].username; let differentChatType = this.chats[index].type !== this.chats[index - 1].type; let bothMachineChat = this.chats[index].type !== 'user' && this.chats[index - 1].type !== 'user'; - return (!recentPreviousMessage || differentUser || differentChatType) && !bothMachineChat; + return !recentPreviousMessage || ((differentUser || differentChatType) && !bothMachineChat); }; this.getImages = function(chat) { From d472e615ed1b3500565578beff0bcf5554246421 Mon Sep 17 00:00:00 2001 From: TheConnMan Date: Sun, 21 May 2017 09:30:49 -0400 Subject: [PATCH 32/35] Update Docker Compose file with MySQL and UTF8 support Closes #193 --- docker-compose.yml | 20 ++++++++++++++++++-- example.env | 2 ++ 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index d96f19b..90dcc96 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -3,14 +3,15 @@ jukebot: container_name: jukebot ports: - "8000:1337" - volumes: - - "/path/to/jukebot/data/:/usr/src/app/data/" labels: - "traefik.backend=jukebot" - "traefik.frontend.rule=Host:jukebot.localhost" environment: - SERVER_URL=http://jukebot.localhost + - MYSQL_HOST=mysql env_file: .env + links: + - mysql restart: always traefik: @@ -25,3 +26,18 @@ traefik: - /path/to/jukebot/traefik.toml:/traefik.toml - /path/to/jukebot/acme.json:/acme.json restart: always + +mysql: + image: mysql + container_name: mysql + command: --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci + ports: + - "3306:3306" + volumes: + - /data/mysql:/var/lib/mysql + environment: + - MYSQL_USER=sails + - MYSQL_PASSWORD=sails + - MYSQL_DATABASE=sails + - MYSQL_RANDOM_ROOT_PASSWORD=yes + restart: always diff --git a/example.env b/example.env index b238df4..e545611 100644 --- a/example.env +++ b/example.env @@ -1,3 +1,5 @@ GOOGLE_API_KEY= SLACK_WEBHOOK= SLASH_TOKEN= +GOOGLE_ID= +GOOGLE_SECRET= From bdc822b847728d3baac159a13271cdda3df7fa5f Mon Sep 17 00:00:00 2001 From: TheConnMan Date: Sun, 21 May 2017 12:51:41 -0400 Subject: [PATCH 33/35] Make Google OAuth parameters optional --- README.md | 4 ++-- api/controllers/HomeController.js | 3 ++- config/bootstrap.js | 16 ++++++++++------ views/partials/header.ejs | 20 +++++++++++--------- 4 files changed, 25 insertions(+), 18 deletions(-) diff --git a/README.md b/README.md index 600b584..343737a 100644 --- a/README.md +++ b/README.md @@ -108,8 +108,8 @@ When developing a new migration script run `grunt db:migrate:create --name= { var pair = tag.split(':'); @@ -65,6 +59,16 @@ module.exports.bootstrap = function(cb) { })); } + if (sails.config.globals.oauth.google.clientID && sails.config.globals.oauth.google.clientSecret) { + passport.use(new GoogleStrategy({ + clientID: sails.config.globals.oauth.google.clientID, + clientSecret: sails.config.globals.oauth.google.clientSecret, + callbackURL: sails.config.serverUrl + '/auth/google/callback' + }, verifyHandler)); + } else { + logger.warn('No Google OAuth environment variables were provided, authentication is disabled'); + } + Video.findOne({ playing: true }).then(function(current, err) { diff --git a/views/partials/header.ejs b/views/partials/header.ejs index eda0071..d2c5d45 100644 --- a/views/partials/header.ejs +++ b/views/partials/header.ejs @@ -3,15 +3,17 @@
- - <% if (user) { %> - - <%= user.name %> - <% } else { %> - - Login - <% } %> - + <% if (auth) { %> + + <% if (user) { %> + + <%= user.name %> + <% } else { %> + + Login + <% } %> + + <% } %>
From 3a17e86263b9971cb311c360eb53bf893c92e665 Mon Sep 17 00:00:00 2001 From: TheConnMan Date: Sun, 21 May 2017 13:33:16 -0400 Subject: [PATCH 34/35] Dynamically position popups Closes #196 --- assets/components/chat.html | 2 +- assets/components/playlist-item.html | 4 ++-- assets/js/app.js | 16 +++++++++++++++ assets/js/components/chat.js | 30 +++++++++++++++++++--------- assets/js/components/playlist.js | 9 +++++++++ assets/styles/jukebot.css | 8 -------- views/partials/currently-playing.ejs | 6 +++--- 7 files changed, 52 insertions(+), 23 deletions(-) diff --git a/assets/components/chat.html b/assets/components/chat.html index fe5d0f5..28ef94c 100644 --- a/assets/components/chat.html +++ b/assets/components/chat.html @@ -13,7 +13,7 @@

Chat
-
+
{{chat.type == 'user' ? chat.username : 'JukeBot'}}
diff --git a/assets/components/playlist-item.html b/assets/components/playlist-item.html index f7aa439..8bbc951 100644 --- a/assets/components/playlist-item.html +++ b/assets/components/playlist-item.html @@ -6,8 +6,8 @@ {{$ctrl.video.title}}
-
- Added by {{$ctrl.video.user}} +
+ Added by {{$ctrl.video.user}}
({{$ctrl.formatDuration()}})
diff --git a/assets/js/app.js b/assets/js/app.js index 615eeb1..2ca42ee 100644 --- a/assets/js/app.js +++ b/assets/js/app.js @@ -146,9 +146,17 @@ app.controller('controller', function($scope, $rootScope, $notification, $storag behavior: 'smooth' }); } + $scope.popupVideo(); }, 0); }, true); + $scope.popupVideo = function() { + $('.playing span[data-content]').popup({ + variation: 'inverted', + position: 'top center' + }); + }; + $rootScope.$watch('profile.username', function() { io.socket._raw.emit('username', $rootScope.profile.username); }); @@ -194,6 +202,7 @@ app.controller('controller', function($scope, $rootScope, $notification, $storag io.socket.on('listening', function(obj) { $scope.listeners = obj.users; $scope.$digest(); + setTimeout($scope.popupListeners); }); $scope.toggleListeners = function() { @@ -207,6 +216,13 @@ app.controller('controller', function($scope, $rootScope, $notification, $storag $scope.listenerCount = function() { return Object.keys($scope.listeners).length; }; + + $scope.popupListeners = function() { + $('.listeners span[data-content]').popup({ + variation: 'inverted', + position: 'top center' + }); + }; /***************** * End Listeners * *****************/ diff --git a/assets/js/components/chat.js b/assets/js/components/chat.js index bf041db..56493b2 100644 --- a/assets/js/components/chat.js +++ b/assets/js/components/chat.js @@ -16,28 +16,39 @@ function ChatController($rootScope, $scope, $http, $notification, $storage, $vid }); }); - this.chats = []; + $scope.chats = []; this.newChat = ''; this.typers = ''; this.getChats = function() { - return this.chats.filter(function(chat) { return new Date(chat.createdAt) >= new Date(Date.now() - chatHistory * 60 * 1000); }); + return $scope.chats.filter(function(chat) { return new Date(chat.createdAt) >= new Date(Date.now() - chatHistory * 60 * 1000); }); }; this.showUsername = function(chat) { - var index = this.chats.indexOf(chat); + var index = $scope.chats.indexOf(chat); let isFirst = index === 0; if (isFirst) { return true; } - let recentPreviousMessage = new Date(this.chats[index].time) - new Date(this.chats[index - 1].time) <= 3 * 60 * 1000; - let differentUser = this.chats[index].username !== this.chats[index - 1].username; - let differentChatType = this.chats[index].type !== this.chats[index - 1].type; - let bothMachineChat = this.chats[index].type !== 'user' && this.chats[index - 1].type !== 'user'; + let recentPreviousMessage = new Date($scope.chats[index].time) - new Date($scope.chats[index - 1].time) <= 3 * 60 * 1000; + let differentUser = $scope.chats[index].username !== $scope.chats[index - 1].username; + let differentChatType = $scope.chats[index].type !== $scope.chats[index - 1].type; + let bothMachineChat = $scope.chats[index].type !== 'user' && $scope.chats[index - 1].type !== 'user'; return !recentPreviousMessage || ((differentUser || differentChatType) && !bothMachineChat); }; + $scope.$watch('chats', function() { + setTimeout(self.popup); + }, true); + + this.popup = function() { + $('#chat-list .user[data-content]').popup({ + variation: 'inverted', + position: 'top center' + }); + }; + this.getImages = function(chat) { return chat.message.match(urlRegex) || []; }; @@ -77,14 +88,15 @@ function ChatController($rootScope, $scope, $http, $notification, $storage, $vid }; io.socket.on('chats', (c) => { - this.chats = c; + $scope.chats = c; $scope.$digest(); highlightChats(); scrollChatToBottom(); + self.popup(); }); io.socket.on('chat', (c) => { - this.chats.push(c); + $scope.chats.push(c); if (c.username !== $rootScope.profile.username && $rootScope.profile.chatNotifications && c.type !== 'addVideo' && c.type !== 'videoSkipped' && c.type !== 'videoPlaying') { let notification = $notification(c.username || 'Anonymous', { body: c.message, diff --git a/assets/js/components/playlist.js b/assets/js/components/playlist.js index 0772ce3..e5c5c2a 100644 --- a/assets/js/components/playlist.js +++ b/assets/js/components/playlist.js @@ -6,6 +6,7 @@ function PlaylistController($rootScope, $scope, $video, $storage, $log, $notific $video.getAll().then(function() { setTimeout(function() { self.scrollToCurrentlyPlaying(); + self.popup(); }, 250); }); $video.subscribe(); @@ -29,6 +30,7 @@ function PlaylistController($rootScope, $scope, $video, $storage, $log, $notific $video.remove(parseInt(obj.id)); } $rootScope.$digest(); + setTimeout(self.popup); }); io.socket.get('/api/subscribeRelatedVideos', {}); @@ -52,6 +54,13 @@ function PlaylistController($rootScope, $scope, $video, $storage, $log, $notific } }; + this.popup = function() { + $('#video-list div[data-content]').popup({ + variation: 'inverted', + position: 'top center' + }); + }; + this.setTab = function(tab) { this.activeTab = tab; diff --git a/assets/styles/jukebot.css b/assets/styles/jukebot.css index 10c9c11..683c3bd 100644 --- a/assets/styles/jukebot.css +++ b/assets/styles/jukebot.css @@ -53,14 +53,6 @@ input, .ui.action.input > .button, .ui.action.input > .buttons > .button { margin-left: 37.5%; } -#chat-list [data-tooltip]:not([data-position]):before { - left: 75%; -} - -#chat-list [data-tooltip]:not([data-position]):after { - left: 100%; -} - .ui.left.sidebar, .ui.right.sidebar { width: 500px!important; } diff --git a/views/partials/currently-playing.ejs b/views/partials/currently-playing.ejs index 5c63e4f..4d9f42f 100644 --- a/views/partials/currently-playing.ejs +++ b/views/partials/currently-playing.ejs @@ -1,4 +1,4 @@ -
+
@@ -20,7 +20,7 @@ {{currentVideo().title}}
- Added by {{currentVideo().user}} + Added by {{currentVideo().user}}
@@ -45,7 +45,7 @@
- + {{user.username}}{{$last ? '' : ', '}}
From 2ccd489566a1c7d599db0aaf3e544e2ac2f1c6a6 Mon Sep 17 00:00:00 2001 From: TheConnMan Date: Sun, 21 May 2017 18:37:26 -0400 Subject: [PATCH 35/35] Version bump to v1.7.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index f15ce2a..6d4172f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "JukeBot", - "version": "1.6.0", + "version": "1.7.0", "description": "Slack-Enabled Syncronized Music Listening", "keywords": [], "dependencies": {