From 786b5c3c8c44b1b4e5884d30bab5ed8006376d62 Mon Sep 17 00:00:00 2001 From: 12px Date: Tue, 6 Apr 2021 14:58:11 -0600 Subject: [PATCH 1/8] Style profile border. --- styles/_style.sass | 1 + 1 file changed, 1 insertion(+) diff --git a/styles/_style.sass b/styles/_style.sass index 3215b8e..7fb3946 100644 --- a/styles/_style.sass +++ b/styles/_style.sass @@ -2,6 +2,7 @@ $accent-text: mix(#ffffff, $accent, 40%) !default $bg-gradient: linear-gradient(to bottom, $accent, darken($accent, 10%)) !default #ts_slider, +.overlay .modal, .score.scoregood, #settings .option.selected, .floating-menu .option.active, From 39a45f635baf2cf76188c13c116f453638902039 Mon Sep 17 00:00:00 2001 From: 12px Date: Tue, 6 Apr 2021 15:05:43 -0600 Subject: [PATCH 2/8] Add styling to more profile, lobby items. --- styles/_style.sass | 7 ++++++- themes/base/_panels.sass | 2 ++ themes/base/_popups.sass | 2 ++ 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/styles/_style.sass b/styles/_style.sass index 7fb3946..0543366 100644 --- a/styles/_style.sass +++ b/styles/_style.sass @@ -18,6 +18,8 @@ $bg-gradient: linear-gradient(to bottom, $accent, darken($accent, 10%)) !default #pmWindows a, #ts_window h4, #topBG #content a, +#myInfo .myName:hover, +#myInfo .myFans:hover, .current-song .details, #ts_window .ts_credits a, .lobby-panel .buddyRoomName, @@ -26,7 +28,9 @@ $bg-gradient: linear-gradient(to bottom, $accent, darken($accent, 10%)) !default #ts_window input:checked:after, .tab-item:not(.selected):hover .tab-title, .chat .message:not(.stat) .subject:hover, -.chat .message:not(.stat) .speaker:hover +.chat .message:not(.stat) .speaker:hover, +.fans .stat-number:not(.disabled):hover, +.fanofs .stat-number:not(.disabled):hover color: $accent-text !important .chat .message.mention @@ -58,6 +62,7 @@ $bg-gradient: linear-gradient(to bottom, $accent, darken($accent, 10%)) !default filter: $grayed #create-room, +.modal .title, #buddyListHeader, .tab-item:active, .tab-item.selected, diff --git a/themes/base/_panels.sass b/themes/base/_panels.sass index 28bdd63..ea79f6c 100644 --- a/themes/base/_panels.sass +++ b/themes/base/_panels.sass @@ -84,7 +84,9 @@ left: 36px #chat-input, +.overlay textarea, #song-search-input, +.overlay input.text, .room-search-input input @extend %text-input &::placeholder diff --git a/themes/base/_popups.sass b/themes/base/_popups.sass index b515482..72dc236 100644 --- a/themes/base/_popups.sass +++ b/themes/base/_popups.sass @@ -65,6 +65,8 @@ .overlay .modal background: $active-tab-bg !important + .title + color: $active-tab-text !important .content-container background: $bg-main !important .content From f968aa68b994071d0ae3e31dbe728da418215bdc Mon Sep 17 00:00:00 2001 From: 12px Date: Tue, 6 Apr 2021 15:30:00 -0600 Subject: [PATCH 3/8] Add ttStats link to profiles. --- scripts/modify.js | 28 ++++++++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) diff --git a/scripts/modify.js b/scripts/modify.js index 2907cc8..a395bcd 100644 --- a/scripts/modify.js +++ b/scripts/modify.js @@ -4,9 +4,12 @@ module.exports = tS => { tS.modify = function () { // bind song count updates - $('#songs-wrapper').on('DOMSubtreeModified', '#songs', countSongs) + $('#songs-wrapper').on(event, '#songs', countSongs) countSongs() + // bind profile stat link updates + $('#maindiv').on(event, '.overlay', attachStats) + // hide the audience/video this.toggleClass('ts_hide_videos', this.config.no_vid) this.toggleClass('ts_hide_audience', this.config.no_aud) @@ -31,9 +34,30 @@ module.exports = tS => { } +const event = 'DOMSubtreeModified' + const countSongs = () => { let head = $('#playlist-header .text')[0] let data = window.turntable.playlist.fileids.length let name = head.innerHTML.split('')[0] head.innerHTML = `${name} ${data}` -} \ No newline at end of file +} + +const attachStats = () => { + let el = $('.profile.modal .userid') + let id = el.length ? el[0].innerHTML : '' + if (id.length != 24) return + + if ($('.profile.modal .statslink').length) return + $('.profile.modal .section.about').before(layout(id)) + + console.log(id) +} + +const layout = id => ` +
+ + ttStats + +
+` \ No newline at end of file From 0ba797ec7af72a00c247f6a0c677727f03305da0 Mon Sep 17 00:00:00 2001 From: 12px Date: Wed, 7 Apr 2021 09:03:13 -0600 Subject: [PATCH 4/8] Hide modal after ttStats opened. --- scripts/modify.js | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/scripts/modify.js b/scripts/modify.js index a395bcd..8a8fa4a 100644 --- a/scripts/modify.js +++ b/scripts/modify.js @@ -44,20 +44,22 @@ const countSongs = () => { } const attachStats = () => { - let el = $('.profile.modal .userid') - let id = el.length ? el[0].innerHTML : '' - if (id.length != 24) return - + // return if we've already attached if ($('.profile.modal .statslink').length) return - $('.profile.modal .section.about').before(layout(id)) - console.log(id) + // find the userid of the user + let data = $('.profile.modal .userid') + let find = data.length ? data[0].innerHTML : '' + if (find.length != 24) return // not a valid id yet + + $('.profile.modal .section.web-links').before(layout(find)) } const layout = id => `
- - ttStats + + View This Profile On ttStats >>
` \ No newline at end of file From c57d4fbbfe26ca290bae443d56fc6414c7020772 Mon Sep 17 00:00:00 2001 From: 12px Date: Wed, 7 Apr 2021 09:03:31 -0600 Subject: [PATCH 5/8] Style ttStats link. --- styles/_style.sass | 1 + themes/base/_content.sass | 2 ++ turnStyles.sass | 3 +++ 3 files changed, 6 insertions(+) diff --git a/styles/_style.sass b/styles/_style.sass index 0543366..68ae575 100644 --- a/styles/_style.sass +++ b/styles/_style.sass @@ -18,6 +18,7 @@ $bg-gradient: linear-gradient(to bottom, $accent, darken($accent, 10%)) !default #pmWindows a, #ts_window h4, #topBG #content a, +.profile .statslink a, #myInfo .myName:hover, #myInfo .myFans:hover, .current-song .details, diff --git a/themes/base/_content.sass b/themes/base/_content.sass index 6951890..1abb994 100644 --- a/themes/base/_content.sass +++ b/themes/base/_content.sass @@ -10,8 +10,10 @@ body, .tab-pane a, #pmWindows a, #topBG #content a, +.profile .statslink a color: $accent !important text-decoration: none !important + background: transparent !important border-bottom: 1px dotted !important #mainNav li:not(.selected) .nav-text, diff --git a/turnStyles.sass b/turnStyles.sass index a7023d4..7ff1638 100644 --- a/turnStyles.sass +++ b/turnStyles.sass @@ -109,6 +109,9 @@ .chat .message.stat:not(:hover) opacity: 0.5 +.section.statslink + text-align: center !important + #playlist-display em top: 0 right: 25px From cbe4777554780d0b2437d8e3a423123f2b9a1cb4 Mon Sep 17 00:00:00 2001 From: 12px Date: Wed, 7 Apr 2021 09:57:46 -0600 Subject: [PATCH 6/8] Restructure modify/hidden. --- scripts/modify.js | 37 ++++++++++++++++++++----------------- 1 file changed, 20 insertions(+), 17 deletions(-) diff --git a/scripts/modify.js b/scripts/modify.js index 8a8fa4a..73ea162 100644 --- a/scripts/modify.js +++ b/scripts/modify.js @@ -3,25 +3,24 @@ module.exports = tS => { tS.modify = function () { - // bind song count updates - $('#songs-wrapper').on(event, '#songs', countSongs) + // song counter + const list = '#songs' + const song = '#songs-wrapper' + $(song).on(modified, list, countSongs) countSongs() - // bind profile stat link updates - $('#maindiv').on(event, '.overlay', attachStats) + // ttStats link + const main = '#maindiv' + const user = '.overlay .profile' + $(main).on(modified, user, attachStats) - // hide the audience/video - this.toggleClass('ts_hide_videos', this.config.no_vid) - this.toggleClass('ts_hide_audience', this.config.no_aud) + // hide elements + this.hidden('no_vid', this.config.no_vid) + this.hidden('no_aud', this.config.no_aud) // replace upload with organize $('#upload-button').after(`
`) - $('#ts_upload').on('click', () => { - let playlist = window.turntable.playlist - if (playlist.isFiltering) playlist.clearSearchBar() - $("#queue-header").removeClass("normal").addClass("edit") - playlist.queue.batchEditMode() - }) + $('#ts_upload').on('click', orderSongs) } tS.hidden = function (key, value) { @@ -34,7 +33,14 @@ module.exports = tS => { } -const event = 'DOMSubtreeModified' +const modified = 'DOMSubtreeModified' + +const orderSongs = () => { + let playlist = window.turntable.playlist + if (playlist.isFiltering) playlist.clearSearchBar() + $("#queue-header").removeClass("normal").addClass("edit") + playlist.queue.batchEditMode() +} const countSongs = () => { let head = $('#playlist-header .text')[0] @@ -44,14 +50,11 @@ const countSongs = () => { } const attachStats = () => { - // return if we've already attached if ($('.profile.modal .statslink').length) return - // find the userid of the user let data = $('.profile.modal .userid') let find = data.length ? data[0].innerHTML : '' if (find.length != 24) return // not a valid id yet - $('.profile.modal .section.web-links').before(layout(find)) } From 4148756c842f7a075eff2c5154e169c15bad0f4a Mon Sep 17 00:00:00 2001 From: 12px Date: Wed, 7 Apr 2021 10:25:18 -0600 Subject: [PATCH 7/8] Better application of styles to miniplayer. --- styles/_style.sass | 7 +++++++ themes/base/_content.sass | 11 +++++++++++ themes/base/_private.sass | 4 +++- 3 files changed, 21 insertions(+), 1 deletion(-) diff --git a/styles/_style.sass b/styles/_style.sass index 68ae575..546a432 100644 --- a/styles/_style.sass +++ b/styles/_style.sass @@ -9,6 +9,9 @@ $bg-gradient: linear-gradient(to bottom, $accent, darken($accent, 10%)) !default .floating-menu .option.selected background: $accent !important +.mini-djs .mini-dj.active .avatar-head + box-shadow: inset 0 0 0 2px $accent !important + .song .progress, .chat .message.mention background: rgba($accent, 0.2) !important @@ -23,6 +26,7 @@ $bg-gradient: linear-gradient(to bottom, $accent, darken($accent, 10%)) !default #myInfo .myFans:hover, .current-song .details, #ts_window .ts_credits a, +.mini-room-current-dj-name, .lobby-panel .buddyRoomName, .roomListItem .needed .count, #ts_hotbar input:checked:after, @@ -54,6 +58,9 @@ $bg-gradient: linear-gradient(to bottom, $accent, darken($accent, 10%)) !default .invite-dj, .header-logo, .song-details, +.songboard-add, +.mini-djs .invite-dj-btn, +.mini-djs .become-dj-btn, .favorite-star.favorited, .buddyListRoom .joinRoomButton, #privateChatIcon.open .chatIcon diff --git a/themes/base/_content.sass b/themes/base/_content.sass index 1abb994..6640255 100644 --- a/themes/base/_content.sass +++ b/themes/base/_content.sass @@ -24,6 +24,17 @@ body, #mainNav li.selected background: $bg-alt !important +.mini-room-view + background-color: transparent !important + +.miniplayer .songboard + filter: grayscale(1) + +.song-playing .songboard-time, +.song-playing .songboard-time-left, +.song-playing .songboard-progress-bar + bottom: -59px + .room-tab .room-name color: $text !important diff --git a/themes/base/_private.sass b/themes/base/_private.sass index 3a5d6de..df87a9c 100644 --- a/themes/base/_private.sass +++ b/themes/base/_private.sass @@ -1,4 +1,6 @@ -.message-history +.message-history, +.conversations-list, +.mini-pms-view .bottom-bar @extend %content-main #buddyList From a43fea0f3f94276e8058a1c2cc0c62bdad175d07 Mon Sep 17 00:00:00 2001 From: 12px Date: Wed, 7 Apr 2021 11:19:08 -0600 Subject: [PATCH 8/8] Build v5.4.0 --- build/manifest.json | 2 +- build/styles/blue.css | 16 +++++++++++++++- build/styles/green.css | 16 +++++++++++++++- build/styles/pink.css | 16 +++++++++++++++- build/styles/purple.css | 16 +++++++++++++++- build/styles/teal.css | 16 +++++++++++++++- build/themes/cosmic.css | 29 +++++++++++++++++++++++++---- build/themes/dark.css | 29 +++++++++++++++++++++++++---- build/themes/midnight.css | 29 +++++++++++++++++++++++++---- build/themes/night.css | 29 +++++++++++++++++++++++++---- build/turnStyles.css | 3 +++ build/turnStyles.js | 2 +- package.json | 2 +- public/manifest.json | 2 +- 14 files changed, 182 insertions(+), 25 deletions(-) diff --git a/build/manifest.json b/build/manifest.json index 796636a..bca7098 100644 --- a/build/manifest.json +++ b/build/manifest.json @@ -1,6 +1,6 @@ { "name": "turnStyles for turntable.fm", - "version": "5.3.5", + "version": "5.4.0", "description": "Apply tweaks to turntable.fm - autobop, autodj, themes, styles, and more!", "manifest_version": 2, "icons": { diff --git a/build/styles/blue.css b/build/styles/blue.css index 6b2a7fe..685dd06 100644 --- a/build/styles/blue.css +++ b/build/styles/blue.css @@ -1,10 +1,14 @@ #ts_slider, +.overlay .modal, .score.scoregood, #settings .option.selected, .floating-menu .option.active, .floating-menu .option.selected { background: #3a88ff !important; } +.mini-djs .mini-dj.active .avatar-head { + box-shadow: inset 0 0 0 2px #3a88ff !important; } + .song .progress, .chat .message.mention { background: rgba(58, 136, 255, 0.2) !important; } @@ -14,15 +18,21 @@ #pmWindows a, #ts_window h4, #topBG #content a, +.profile .statslink a, +#myInfo .myName:hover, +#myInfo .myFans:hover, .current-song .details, #ts_window .ts_credits a, +.mini-room-current-dj-name, .lobby-panel .buddyRoomName, .roomListItem .needed .count, #ts_hotbar input:checked:after, #ts_window input:checked:after, .tab-item:not(.selected):hover .tab-title, .chat .message:not(.stat) .subject:hover, -.chat .message:not(.stat) .speaker:hover { +.chat .message:not(.stat) .speaker:hover, +.fans .stat-number:not(.disabled):hover, +.fanofs .stat-number:not(.disabled):hover { color: #89b8ff !important; } .chat .message.mention { @@ -45,6 +55,9 @@ .invite-dj, .header-logo, .song-details, +.songboard-add, +.mini-djs .invite-dj-btn, +.mini-djs .become-dj-btn, .favorite-star.favorited, .buddyListRoom .joinRoomButton, #privateChatIcon.open .chatIcon { @@ -54,6 +67,7 @@ filter: sepia(1) hue-rotate(180deg) saturate(4); } #create-room, +.modal .title, #buddyListHeader, .tab-item:active, .tab-item.selected, diff --git a/build/styles/green.css b/build/styles/green.css index 3066e87..d40eabf 100644 --- a/build/styles/green.css +++ b/build/styles/green.css @@ -1,10 +1,14 @@ #ts_slider, +.overlay .modal, .score.scoregood, #settings .option.selected, .floating-menu .option.active, .floating-menu .option.selected { background: #46a100 !important; } +.mini-djs .mini-dj.active .avatar-head { + box-shadow: inset 0 0 0 2px #46a100 !important; } + .song .progress, .chat .message.mention { background: rgba(70, 161, 0, 0.2) !important; } @@ -14,15 +18,21 @@ #pmWindows a, #ts_window h4, #topBG #content a, +.profile .statslink a, +#myInfo .myName:hover, +#myInfo .myFans:hover, .current-song .details, #ts_window .ts_credits a, +.mini-room-current-dj-name, .lobby-panel .buddyRoomName, .roomListItem .needed .count, #ts_hotbar input:checked:after, #ts_window input:checked:after, .tab-item:not(.selected):hover .tab-title, .chat .message:not(.stat) .subject:hover, -.chat .message:not(.stat) .speaker:hover { +.chat .message:not(.stat) .speaker:hover, +.fans .stat-number:not(.disabled):hover, +.fanofs .stat-number:not(.disabled):hover { color: #90c766 !important; } .chat .message.mention { @@ -45,6 +55,9 @@ .invite-dj, .header-logo, .song-details, +.songboard-add, +.mini-djs .invite-dj-btn, +.mini-djs .become-dj-btn, .favorite-star.favorited, .buddyListRoom .joinRoomButton, #privateChatIcon.open .chatIcon { @@ -54,6 +67,7 @@ filter: sepia(1) hue-rotate(50deg) saturate(4); } #create-room, +.modal .title, #buddyListHeader, .tab-item:active, .tab-item.selected, diff --git a/build/styles/pink.css b/build/styles/pink.css index 62fc67d..9ba1c38 100644 --- a/build/styles/pink.css +++ b/build/styles/pink.css @@ -1,10 +1,14 @@ #ts_slider, +.overlay .modal, .score.scoregood, #settings .option.selected, .floating-menu .option.active, .floating-menu .option.selected { background: #d554da !important; } +.mini-djs .mini-dj.active .avatar-head { + box-shadow: inset 0 0 0 2px #d554da !important; } + .song .progress, .chat .message.mention { background: rgba(213, 84, 218, 0.2) !important; } @@ -14,15 +18,21 @@ #pmWindows a, #ts_window h4, #topBG #content a, +.profile .statslink a, +#myInfo .myName:hover, +#myInfo .myFans:hover, .current-song .details, #ts_window .ts_credits a, +.mini-room-current-dj-name, .lobby-panel .buddyRoomName, .roomListItem .needed .count, #ts_hotbar input:checked:after, #ts_window input:checked:after, .tab-item:not(.selected):hover .tab-title, .chat .message:not(.stat) .subject:hover, -.chat .message:not(.stat) .speaker:hover { +.chat .message:not(.stat) .speaker:hover, +.fans .stat-number:not(.disabled):hover, +.fanofs .stat-number:not(.disabled):hover { color: #e698e9 !important; } .chat .message.mention { @@ -45,6 +55,9 @@ .invite-dj, .header-logo, .song-details, +.songboard-add, +.mini-djs .invite-dj-btn, +.mini-djs .become-dj-btn, .favorite-star.favorited, .buddyListRoom .joinRoomButton, #privateChatIcon.open .chatIcon { @@ -54,6 +67,7 @@ filter: sepia(1) hue-rotate(250deg) saturate(4); } #create-room, +.modal .title, #buddyListHeader, .tab-item:active, .tab-item.selected, diff --git a/build/styles/purple.css b/build/styles/purple.css index 7e8a625..98dea56 100644 --- a/build/styles/purple.css +++ b/build/styles/purple.css @@ -1,10 +1,14 @@ #ts_slider, +.overlay .modal, .score.scoregood, #settings .option.selected, .floating-menu .option.active, .floating-menu .option.selected { background: #9075ff !important; } +.mini-djs .mini-dj.active .avatar-head { + box-shadow: inset 0 0 0 2px #9075ff !important; } + .song .progress, .chat .message.mention { background: rgba(144, 117, 255, 0.2) !important; } @@ -14,15 +18,21 @@ #pmWindows a, #ts_window h4, #topBG #content a, +.profile .statslink a, +#myInfo .myName:hover, +#myInfo .myFans:hover, .current-song .details, #ts_window .ts_credits a, +.mini-room-current-dj-name, .lobby-panel .buddyRoomName, .roomListItem .needed .count, #ts_hotbar input:checked:after, #ts_window input:checked:after, .tab-item:not(.selected):hover .tab-title, .chat .message:not(.stat) .subject:hover, -.chat .message:not(.stat) .speaker:hover { +.chat .message:not(.stat) .speaker:hover, +.fans .stat-number:not(.disabled):hover, +.fanofs .stat-number:not(.disabled):hover { color: #bcacff !important; } .chat .message.mention { @@ -45,6 +55,9 @@ .invite-dj, .header-logo, .song-details, +.songboard-add, +.mini-djs .invite-dj-btn, +.mini-djs .become-dj-btn, .favorite-star.favorited, .buddyListRoom .joinRoomButton, #privateChatIcon.open .chatIcon { @@ -54,6 +67,7 @@ filter: sepia(1) hue-rotate(245deg) saturate(4); } #create-room, +.modal .title, #buddyListHeader, .tab-item:active, .tab-item.selected, diff --git a/build/styles/teal.css b/build/styles/teal.css index 1e2050b..4929ca6 100644 --- a/build/styles/teal.css +++ b/build/styles/teal.css @@ -1,10 +1,14 @@ #ts_slider, +.overlay .modal, .score.scoregood, #settings .option.selected, .floating-menu .option.active, .floating-menu .option.selected { background: #00a5bc !important; } +.mini-djs .mini-dj.active .avatar-head { + box-shadow: inset 0 0 0 2px #00a5bc !important; } + .song .progress, .chat .message.mention { background: rgba(0, 165, 188, 0.2) !important; } @@ -14,15 +18,21 @@ #pmWindows a, #ts_window h4, #topBG #content a, +.profile .statslink a, +#myInfo .myName:hover, +#myInfo .myFans:hover, .current-song .details, #ts_window .ts_credits a, +.mini-room-current-dj-name, .lobby-panel .buddyRoomName, .roomListItem .needed .count, #ts_hotbar input:checked:after, #ts_window input:checked:after, .tab-item:not(.selected):hover .tab-title, .chat .message:not(.stat) .subject:hover, -.chat .message:not(.stat) .speaker:hover { +.chat .message:not(.stat) .speaker:hover, +.fans .stat-number:not(.disabled):hover, +.fanofs .stat-number:not(.disabled):hover { color: #66c9d7 !important; } .chat .message.mention { @@ -45,6 +55,9 @@ .invite-dj, .header-logo, .song-details, +.songboard-add, +.mini-djs .invite-dj-btn, +.mini-djs .become-dj-btn, .favorite-star.favorited, .buddyListRoom .joinRoomButton, #privateChatIcon.open .chatIcon { @@ -54,6 +67,7 @@ filter: sepia(1) hue-rotate(160deg) saturate(4); } #create-room, +.modal .title, #buddyListHeader, .tab-item:active, .tab-item.selected, diff --git a/build/themes/cosmic.css b/build/themes/cosmic.css index 41e8f2d..70cc3da 100644 --- a/build/themes/cosmic.css +++ b/build/themes/cosmic.css @@ -10,7 +10,9 @@ .striped-list > :nth-child(even):not(.separator), .song-list > ul > :nth-child(even):not(.separator), .message-history > :nth-child(even):not(.separator), -.conversations-list > ul > :nth-child(even):not(.separator), .message-history, #ts_hotbar, +.conversations-list > ul > :nth-child(even):not(.separator), .message-history, +.conversations-list, +.mini-pms-view .bottom-bar, #ts_hotbar, #ts_window { box-shadow: none !important; text-shadow: none !important; @@ -44,7 +46,9 @@ background: #291f4a !important; } #chat-input, +.overlay textarea, #song-search-input, +.overlay input.text, .room-search-input input, .message-input { border: none !important; box-shadow: none !important; @@ -71,9 +75,11 @@ .tab-pane a, #pmWindows a, -#topBG #content a { +#topBG #content a, +.profile .statslink a { color: #e1bb22 !important; text-decoration: none !important; + background: transparent !important; border-bottom: 1px dotted !important; } #mainNav li:not(.selected) .nav-text, @@ -84,6 +90,17 @@ #mainNav li.selected { background: #1d1634 !important; } +.mini-room-view { + background-color: transparent !important; } + +.miniplayer .songboard { + filter: grayscale(1); } + +.song-playing .songboard-time, +.song-playing .songboard-time-left, +.song-playing .songboard-progress-bar { + bottom: -59px; } + .room-tab .room-name { color: #ede8ff !important; } @@ -198,6 +215,8 @@ .overlay .modal { background: #e1bb22 !important; } + .overlay .modal .title { + color: #ffffff !important; } .overlay .modal .content-container { background: #19132d !important; } .overlay .modal .content-container .content { @@ -278,14 +297,16 @@ .song-search { left: 36px; } -#chat-input::-moz-placeholder, #song-search-input::-moz-placeholder, .room-search-input input::-moz-placeholder { +#chat-input::-moz-placeholder, .overlay textarea::-moz-placeholder, #song-search-input::-moz-placeholder, .overlay input.text::-moz-placeholder, .room-search-input input::-moz-placeholder { color: #b19cff !important; } -#chat-input:-ms-input-placeholder, #song-search-input:-ms-input-placeholder, .room-search-input input:-ms-input-placeholder { +#chat-input:-ms-input-placeholder, .overlay textarea:-ms-input-placeholder, #song-search-input:-ms-input-placeholder, .overlay input.text:-ms-input-placeholder, .room-search-input input:-ms-input-placeholder { color: #b19cff !important; } #chat-input::placeholder, +.overlay textarea::placeholder, #song-search-input::placeholder, +.overlay input.text::placeholder, .room-search-input input::placeholder { color: #b19cff !important; } diff --git a/build/themes/dark.css b/build/themes/dark.css index a255cef..921bafc 100644 --- a/build/themes/dark.css +++ b/build/themes/dark.css @@ -10,7 +10,9 @@ .striped-list > :nth-child(even):not(.separator), .song-list > ul > :nth-child(even):not(.separator), .message-history > :nth-child(even):not(.separator), -.conversations-list > ul > :nth-child(even):not(.separator), .message-history, #ts_hotbar, +.conversations-list > ul > :nth-child(even):not(.separator), .message-history, +.conversations-list, +.mini-pms-view .bottom-bar, #ts_hotbar, #ts_window { box-shadow: none !important; text-shadow: none !important; @@ -44,7 +46,9 @@ background: #434343 !important; } #chat-input, +.overlay textarea, #song-search-input, +.overlay input.text, .room-search-input input, .message-input { border: none !important; box-shadow: none !important; @@ -71,9 +75,11 @@ .tab-pane a, #pmWindows a, -#topBG #content a { +#topBG #content a, +.profile .statslink a { color: #e1bb22 !important; text-decoration: none !important; + background: transparent !important; border-bottom: 1px dotted !important; } #mainNav li:not(.selected) .nav-text, @@ -84,6 +90,17 @@ #mainNav li.selected { background: #343434 !important; } +.mini-room-view { + background-color: transparent !important; } + +.miniplayer .songboard { + filter: grayscale(1); } + +.song-playing .songboard-time, +.song-playing .songboard-time-left, +.song-playing .songboard-progress-bar { + bottom: -59px; } + .room-tab .room-name { color: #d8d8d8 !important; } @@ -198,6 +215,8 @@ .overlay .modal { background: #e1bb22 !important; } + .overlay .modal .title { + color: #ffffff !important; } .overlay .modal .content-container { background: #2f2f2f !important; } .overlay .modal .content-container .content { @@ -278,14 +297,16 @@ .song-search { left: 36px; } -#chat-input::-moz-placeholder, #song-search-input::-moz-placeholder, .room-search-input input::-moz-placeholder { +#chat-input::-moz-placeholder, .overlay textarea::-moz-placeholder, #song-search-input::-moz-placeholder, .overlay input.text::-moz-placeholder, .room-search-input input::-moz-placeholder { color: #b2b2b2 !important; } -#chat-input:-ms-input-placeholder, #song-search-input:-ms-input-placeholder, .room-search-input input:-ms-input-placeholder { +#chat-input:-ms-input-placeholder, .overlay textarea:-ms-input-placeholder, #song-search-input:-ms-input-placeholder, .overlay input.text:-ms-input-placeholder, .room-search-input input:-ms-input-placeholder { color: #b2b2b2 !important; } #chat-input::placeholder, +.overlay textarea::placeholder, #song-search-input::placeholder, +.overlay input.text::placeholder, .room-search-input input::placeholder { color: #b2b2b2 !important; } diff --git a/build/themes/midnight.css b/build/themes/midnight.css index 6c07845..7415645 100644 --- a/build/themes/midnight.css +++ b/build/themes/midnight.css @@ -10,7 +10,9 @@ .striped-list > :nth-child(even):not(.separator), .song-list > ul > :nth-child(even):not(.separator), .message-history > :nth-child(even):not(.separator), -.conversations-list > ul > :nth-child(even):not(.separator), .message-history, #ts_hotbar, +.conversations-list > ul > :nth-child(even):not(.separator), .message-history, +.conversations-list, +.mini-pms-view .bottom-bar, #ts_hotbar, #ts_window { box-shadow: none !important; text-shadow: none !important; @@ -44,7 +46,9 @@ background: #0f2d58 !important; } #chat-input, +.overlay textarea, #song-search-input, +.overlay input.text, .room-search-input input, .message-input { border: none !important; box-shadow: none !important; @@ -71,9 +75,11 @@ .tab-pane a, #pmWindows a, -#topBG #content a { +#topBG #content a, +.profile .statslink a { color: #e1bb22 !important; text-decoration: none !important; + background: transparent !important; border-bottom: 1px dotted !important; } #mainNav li:not(.selected) .nav-text, @@ -84,6 +90,17 @@ #mainNav li.selected { background: #0a1f3e !important; } +.mini-room-view { + background-color: transparent !important; } + +.miniplayer .songboard { + filter: grayscale(1); } + +.song-playing .songboard-time, +.song-playing .songboard-time-left, +.song-playing .songboard-progress-bar { + bottom: -59px; } + .room-tab .room-name { color: #e2eeff !important; } @@ -198,6 +215,8 @@ .overlay .modal { background: #e1bb22 !important; } + .overlay .modal .title { + color: #ffffff !important; } .overlay .modal .content-container { background: #091b35 !important; } .overlay .modal .content-container .content { @@ -278,14 +297,16 @@ .song-search { left: 36px; } -#chat-input::-moz-placeholder, #song-search-input::-moz-placeholder, .room-search-input input::-moz-placeholder { +#chat-input::-moz-placeholder, .overlay textarea::-moz-placeholder, #song-search-input::-moz-placeholder, .overlay input.text::-moz-placeholder, .room-search-input input::-moz-placeholder { color: #96c1ff !important; } -#chat-input:-ms-input-placeholder, #song-search-input:-ms-input-placeholder, .room-search-input input:-ms-input-placeholder { +#chat-input:-ms-input-placeholder, .overlay textarea:-ms-input-placeholder, #song-search-input:-ms-input-placeholder, .overlay input.text:-ms-input-placeholder, .room-search-input input:-ms-input-placeholder { color: #96c1ff !important; } #chat-input::placeholder, +.overlay textarea::placeholder, #song-search-input::placeholder, +.overlay input.text::placeholder, .room-search-input input::placeholder { color: #96c1ff !important; } diff --git a/build/themes/night.css b/build/themes/night.css index f0ce924..cdf5ec9 100644 --- a/build/themes/night.css +++ b/build/themes/night.css @@ -10,7 +10,9 @@ .striped-list > :nth-child(even):not(.separator), .song-list > ul > :nth-child(even):not(.separator), .message-history > :nth-child(even):not(.separator), -.conversations-list > ul > :nth-child(even):not(.separator), .message-history, #ts_hotbar, +.conversations-list > ul > :nth-child(even):not(.separator), .message-history, +.conversations-list, +.mini-pms-view .bottom-bar, #ts_hotbar, #ts_window { box-shadow: none !important; text-shadow: none !important; @@ -44,7 +46,9 @@ background: #282828 !important; } #chat-input, +.overlay textarea, #song-search-input, +.overlay input.text, .room-search-input input, .message-input { border: none !important; box-shadow: none !important; @@ -71,9 +75,11 @@ .tab-pane a, #pmWindows a, -#topBG #content a { +#topBG #content a, +.profile .statslink a { color: #e1bb22 !important; text-decoration: none !important; + background: transparent !important; border-bottom: 1px dotted !important; } #mainNav li:not(.selected) .nav-text, @@ -84,6 +90,17 @@ #mainNav li.selected { background: #191919 !important; } +.mini-room-view { + background-color: transparent !important; } + +.miniplayer .songboard { + filter: grayscale(1); } + +.song-playing .songboard-time, +.song-playing .songboard-time-left, +.song-playing .songboard-progress-bar { + bottom: -59px; } + .room-tab .room-name { color: #b9b9b9 !important; } @@ -198,6 +215,8 @@ .overlay .modal { background: #e1bb22 !important; } + .overlay .modal .title { + color: #ffffff !important; } .overlay .modal .content-container { background: #141414 !important; } .overlay .modal .content-container .content { @@ -278,14 +297,16 @@ .song-search { left: 36px; } -#chat-input::-moz-placeholder, #song-search-input::-moz-placeholder, .room-search-input input::-moz-placeholder { +#chat-input::-moz-placeholder, .overlay textarea::-moz-placeholder, #song-search-input::-moz-placeholder, .overlay input.text::-moz-placeholder, .room-search-input input::-moz-placeholder { color: #939393 !important; } -#chat-input:-ms-input-placeholder, #song-search-input:-ms-input-placeholder, .room-search-input input:-ms-input-placeholder { +#chat-input:-ms-input-placeholder, .overlay textarea:-ms-input-placeholder, #song-search-input:-ms-input-placeholder, .overlay input.text:-ms-input-placeholder, .room-search-input input:-ms-input-placeholder { color: #939393 !important; } #chat-input::placeholder, +.overlay textarea::placeholder, #song-search-input::placeholder, +.overlay input.text::placeholder, .room-search-input input::placeholder { color: #939393 !important; } diff --git a/build/turnStyles.css b/build/turnStyles.css index c5b9e0c..9632f26 100644 --- a/build/turnStyles.css +++ b/build/turnStyles.css @@ -110,6 +110,9 @@ .chat .message.stat:not(:hover) { opacity: 0.5; } +.section.statslink { + text-align: center !important; } + #playlist-display em { top: 0; right: 25px; diff --git a/build/turnStyles.js b/build/turnStyles.js index a8ae915..1283bbd 100644 --- a/build/turnStyles.js +++ b/build/turnStyles.js @@ -1 +1 @@ -!function(){var t,e,n=(t=function(t,e){t.exports={version:"5.3.5"}},function(n){return e||t(e={exports:{},parent:n},e.exports),e.exports});const i=t=>`\n
\n

\u2630 tS

\n ${a(t)}\n
\n
\n

\u2715 tS

\n ${l}\n ${d(t)}\n ${h(t)}\n ${c(t)}\n ${r(t)}\n ${u(t)}\n
\n`,s=(t,e,n)=>`\n \n`,o=(t,e)=>`\n \n`,a=t=>`\n ${s(t,"autobop","Autobop")}\n ${s(t,"nextdj","Next DJ Spot")}\n ${s(t,"pingdj","Wait For Ping")}\n`,l='\n
\n
Options
\n
Visual
\n
In Chat
\n
Notify
\n
\n',d=t=>`\n
\n

General Features

\n ${s(t,"autobop","Autobop")}\n ${s(t,"has_vol","Control Volume")}\n
\n ${s(t,"nextdj","Next DJ Spot")}\n ${s(t,"pingdj","Wait For Ping")}\n
\n`,h=t=>`\n
\n

Visual Options

\n ${o(t,"theme")}\n ${o(t,"style")}\n
\n ${s(t,"no_aud","Hide Audience")}\n ${s(t,"no_vid","Hide Player")}\n
\n`,c=t=>`\n
\n

Post Messages In Chat

\n ${s(t,"chat_song","Last Song Stats")}\n ${s(t,"chat_spun","Dropped DJ Stats")}\n
\n ${s(t,"chat_snag","User Snags")}\n ${s(t,"chat_join","User Joins")}\n ${s(t,"chat_left","User Leaves")}\n
\n`,r=t=>`\n
\n

Send Desktop Notifications

\n ${s(t,"ping_pm","On DMs")}\n ${s(t,"ping_chat","On Mentions")}\n ${s(t,"ping_song","On New Songs")}\n
\n`,u=t=>`\n
\n \u2714\ufe0e CLOSE\n v${t.config.version}\n \n \n Join me on the TT Discord\n \n \n
\n`;const g=(t,e,n)=>`${n?`${t}/${n}`:""+t}/${e}.css`,p=(t,e,n)=>{let i=document.createElement("link");i.classList.add("tS-"+(n||"core")),i.type="text/css",i.rel="stylesheet",i.href=g(t,e,n),document.head.append(i)},m=(t,e,n)=>{let i=$("link.tS-"+n);if(!e)return!!i.length&&i.remove();i.length?i.attr("href",g(t,e,n)):p(t,e,n)};const f=()=>{let t=$("#playlist-header .text")[0],e=window.turntable.playlist.fileids.length,n=t.innerHTML.split("")[0];t.innerHTML=`${n} ${e}`};const _=t=>Math.log(t/100)/Math.LN2+4,v=t=>{let e=t||window.util.getSetting("volume");return 100*Math.pow(2,e-4)},b=`\n
\n \n \n \n Muted For One Song\n
\n`;const w=()=>{$(window).focus();let t={bubbles:!0,cancelable:!0,view:window},e=document.querySelectorAll(".awesome-button")[0],n=new MouseEvent("click",t);return!e.dispatchEvent(n)};const y=(t,e,n="")=>`\n
\n \n ${t}\n ${e}\n \n
\n`;const j={};(t=>{t.Log=t=>console.info("turnStyles :: "+t),t.user=()=>window.turntable.user,t.view=()=>window.turntable.topViewController,t.icon=()=>this.__base+"/images/icon128.png",t.userName=e=>{let n=t.view().userMap[e];return n?n.attributes.name:"Someone"},t.buddyName=t=>{let e=window.turntable.buddyList.pmWindows[t];return!!e&&e.otherUser.attributes.name},t.pinged=e=>{let n="@"+t.user().attributes.name.toLowerCase();return e.toLowerCase().indexOf(n)>-1},t.toggleClass=(t,e)=>{let n=$("body").hasClass(t);e&&!n&&$("body").addClass(t),n&&!e&&$("body").removeClass(t)},t.holding={},t.suspend=function(t,e,n){this.holding[n]?clearTimeout(this.holding[n]):t&&t();let i=1e3*e;this.holding[n]=setTimeout((()=>{delete this.holding[n]}).bind(this),i)}})(j),(t=>{t.on=function(t,e){this.events[t]||(this.events[t]=[]),this.events[t].push(e.bind(this))},t.emit=function(t,e,n){let i=this.events[t];if(i)for(let s of i)s(e,n)},t.handle=function(t){t.command&&this.emit(t.command,t)},t.events={}})(j),(t=>{t.default={theme:"dark",style:"",autobop:!0,nextdj:!1,pingdj:!1,has_vol:!1,no_aud:!1,no_vid:!1,ping_pm:!1,ping_song:!1,ping_chat:!1,chat_song:!1,chat_spun:!1,chat_snag:!1,chat_join:!1,chat_left:!1},t.options={theme:{dark:"Dark Mode",night:"Night Mode",cosmic:"Cosmic",midnight:"Midnight"},style:{pink:"Pink",blue:"Blue",teal:"Teal",green:"Green",purple:"Purple"}},t.saveConfig=function(t){let e="checkbox"==t.target.type,n=t.target.id.split("ts_").join(""),i=e?t.target.checked:t.target.value;$(`#ts_hotbar #${t.target.id}, #ts_window #${t.target.id}`).prop(e?"checked":"value",i),this.config[n]=i;let s=JSON.stringify(this.config);window.localStorage.setItem("tsdb",s),this.Log("saved config");let o="style"==n||"theme"==n;this.lobby?o&&this.updateThemes(n,i):this.emit("update",n,i)}})(j),(t=>{t.last_played={},t.now_playing={},t.current_djs={},t.buildCache=function(t){for(let e of t.djids)this.cacheNewDJ(e);this.cacheTrack(t.currentSong)},t.cacheTrack=function(t){let e=t&&t.room?t.room.metadata.current_song:t,n=t&&t.upvoters?t.upvoters.length:0,i=!!e&&e.djid,s={...this.now_playing},o={love:n,hate:0,snag:0,dj:i};this.last_played=s,this.now_playing=e?{...e.metadata,...o}:{},s.song&&this.current_djs[s.dj]?(this.current_djs[s.dj].spun+=1,this.current_djs[s.dj].love+=s.love,this.current_djs[s.dj].hate+=s.hate,this.current_djs[s.dj].snag+=s.snag):s.song&&this.cacheNewDJ(s.dj,s);let a=!1;s.song&&(a=`${s.love}\u2764\ufe0f${s.hate}\ud83d\udc94${s.snag}\ud83d\udc96`),this.emit("tracked",a),this.Log("cached track: "+(this.now_playing.song||"nosong"))},t.cacheNewDJ=function(t,e){let n=t.user?t.user[0].userid:t;this.current_djs[n]||(this.current_djs[n]={spun:e&&e.spun?e.spun:0,love:e&&e.love?e.love:0,hate:e&&e.hate?e.hate:0,snag:e&&e.snag?e.snag:0}),this.Log("cached new DJ: "+n)},t.cacheSnags=function(){this.now_playing.snag+=1},t.cacheVotes=function(t){this.now_playing.love=t.room.metadata.upvotes,this.now_playing.hate=t.room.metadata.downvotes},t.clearOldDJ=function(t){let e=t.user[0].name,n=t.user[0].userid;if(!this.current_djs[n])return;let i={...this.current_djs[n]},s=`${i.love}\u2764\ufe0f${i.hate}\ud83d\udc94${i.snag}\ud83d\udc96${i.spun}\u25b6\ufe0f`;delete this.current_djs[n],this.emit("dropped",e,s)},t.on("attach",t.buildCache),t.on("add_dj",t.cacheNewDJ),t.on("rem_dj",t.clearOldDJ),t.on("nosong",t.cacheTrack),t.on("newsong",t.cacheTrack),t.on("snagged",t.cacheSnags),t.on("update_votes",t.cacheVotes)})(j),(t=>{t.init=function(){if(this.__base)return;this.chrome=!!window.tsBase,this.__base=window.tsBase||"https://ts.pixelcrisis.co/build";let t=window.localStorage.getItem("tsdb"),e=t?JSON.parse(t):{},i=n({}).version;this.config={...this.default,...e,version:i},this.emit("loaded",this.config),this.attach()},t.attach=function(){let n=window.turntable;if(!n)return this.Log("no room");if(this.lobby=$("#turntable #topBG").length,this.lobby)return this.buildWindow();let i=()=>setTimeout(t.attach.bind(this),150);if(!n.user)return i();let s=e(n,"roomId");return s&&e(s,"roomData")?(this.realVolume=window.turntablePlayer.realVolume,n.addEventListener("message",this.handle.bind(this)),this.emit("attach",s),void this.Log("loaded room")):i()};const e=function(t,e){for(let n in t){let i=t[n];if(null!=i&&i[e])return i}}})(j),(t=>{t.buildWindow=function(){$(".header-bar").append(i(this)),$(".ts_menu").on("click",()=>{$("#ts_hotbar, #ts_window").toggleClass("active")}),$("#ts_tabs div").on("click",t=>{$("#ts_tabs div, .ts_tab").removeClass("active"),$("."+t.currentTarget.className).addClass("active")}),$(".ts_option").on("change",t.saveConfig.bind(this))},t.on("attach",t.buildWindow)})(j),(t=>{t.loadThemes=function(t){p(this.__base,"turnStyles"),this.updateThemes("theme",t.theme),this.updateThemes("style",t.style)},t.updateThemes=function(t,e){"theme"==t&&m(this.__base,e,"themes"),"style"==t&&m(this.__base,e,"styles")},t.on("loaded",t.loadThemes),t.on("update",t.updateThemes)})(j),(t=>{t.modify=function(){$("#songs-wrapper").on("DOMSubtreeModified","#songs",f),f(),this.toggleClass("ts_hide_videos",this.config.no_vid),this.toggleClass("ts_hide_audience",this.config.no_aud),$("#upload-button").after('
'),$("#ts_upload").on("click",()=>{let t=window.turntable.playlist;t.isFiltering&&t.clearSearchBar(),$("#queue-header").removeClass("normal").addClass("edit"),t.queue.batchEditMode()})},t.hidden=function(t,e){"no_vid"==t&&this.toggleClass("ts_hide_videos",e),"no_aud"==t&&this.toggleClass("ts_hide_audience",e)},t.on("attach",t.modify),t.on("update",t.hidden)})(j),(t=>{t.loadVolume=function(){let t=this.config.has_vol,e=$("body").hasClass("has-volume");this.toggleClass("has-volume",t),e&&!t&&this.remVolume(),t&&!e&&this.addVolume()},t.addVolume=function(){$(".header-content").append(b),$("#ts_mute").on("click",this.toggleMute.bind(this)),$("#ts_slider").on("input",this.saveVolume.bind(this)),$("#ts_slider").on("DOMMouseScroll mousewheel",this.onVolWheel.bind(this))},t.remVolume=function(){$("#ts_volume").remove(),window.turntablePlayer.realVolume=this.realVolume},t.saveVolume=function(t){let e=(t=t.target?t.target.value:t)>0?_(t):-3;window.turntablePlayer.realVolume=e>6?this.realVolume:v,window.turntablePlayer.setVolume(e),window.util.setSetting("volume",e)},t.onVolWheel=function(t){const e=v();let n=t.originalEvent.shiftKey?1:5,i=t.originalEvent.deltaY>0?e-n:e+n;return i=i<0?0:i>100?100:i,$("#ts_slider")[0].value=i,this.saveVolume(i),!1},t.checkMuted=function(){this.mute&&this.toggleMute()},t.toggleMute=function(){this.mute=!this.mute,$("#ts_volume").toggleClass("muted",this.mute);let t=this.mute?-3:_(v());window.turntablePlayer.setVolume(t),this.Log("turned mute "+(this.mute?"on":"off"))},t.on("attach",t.loadVolume),t.on("update",t.loadVolume),t.on("nosong",t.checkMuted),t.on("newsong",t.checkMuted)})(j),(t=>{t.autoBop=function(){if(this.bopping&&clearTimeout(this.bopping),!this.config.autobop)return;let t=7*Math.random()*100;this.bopping=setTimeout(w,t)},t.on("attach",t.autoBop),t.on("newsong",t.autoBop)})(j),(t=>{t.checkDecks=function(){this.config.nextdj&&(this.config.pingdj?this.suspend(null,2,"nextdj"):this.tryJumping())},t.tryJumping=function(){if(!$(".become-dj").length)return this.Log("nextdj: no spot");this.Log("nextdj: taking spot"),this.view().becomeDj()},t.isSpinning=function(t){if(!this.config.nextdj)return;if(this.user().id!=t.user[0].userid)return;this.config.nextdj=!1,$("#ts_hotbar #ts_nextdj").prop("checked",!1),$("#ts_hotbar #ts_nextdj").trigger("change");let e="You've Hopped On Deck!",n="NextDJ is now disabled.";this.sendNotify({head:e,text:n}),this.postToChat(e,n)},t.nextOnPing=function(t){this.pinged(t.text)&&this.holding.nextdj&&this.tryJumping()},t.on("attach",t.checkDecks),t.on("update",t.checkDecks),t.on("rem_dj",t.checkDecks),t.on("add_dj",t.isSpinning),t.on("speak",t.nextOnPing)})(j),(t=>{t.notifyAuth=function(){let t=this.config;return!(!(t.ping_chat||t.ping_pm||t.ping_song)||this.chrome||!("Notification"in window)||"denied"===Notification.permission||"default"===Notification.permission&&(this.Log("requesting notifcation permission"),Notification.requestPermission(),1))},t.stopNotify=function(){return!!document.hasFocus()||!this.chrome&&!this.notifyAuth()},t.sendNotify=function(t,e){if(this.stopNotify())return;let n=this.notifyType(t);return e?this.suspend(n,5,e):n()},t.notifyType=function(t){let e={type:"tsNotify",notification:t},n={icon:this.icon(),body:t.text};return this.chrome?()=>window.postMessage(e):()=>{let e=new Notification(t.head,n);e.onclick=()=>{window.focus(),e.close()}}},t.postToChat=function(t,e,n){$(".chat .messages").append(y(t,e,n)),this.view().updateChatScroll()},t.on("attach",t.notifyAuth),t.on("update",t.notifyAuth)})(j),(t=>{t.alertSong=function(t){let e=this.now_playing.song;if(e&&this.config.ping_song){let n="Now Playing: "+e,i=t||"By: "+this.now_playing.artist;this.sendNotify({head:n,text:i})}if(t&&this.config.chat_song){let e=this.last_played,n=`${e.song} by ${e.artist}`;this.postToChat(t,n,"stat")}},t.alertDrop=function(t,e){if(this.config.chat_spun){let n=`${t} - ${e}`,i="- is done spining!";this.postToChat(n,i,"stat")}},t.alertPm=function(t){if(this.config.ping_pm){let e=this.buddyName(t.senderid),n=e?"New PM from: "+e:"New PM";this.sendNotify({head:n,text:t.text},"ping_pm")}},t.alertPing=function(t){if(this.pinged(t.text)&&this.config.ping_chat){let e=`[${this.view().roomData.name}] @${t.name}`;this.sendNotify({head:e,text:t.text},"ping_chat")}},t.alertSnag=function(t){if(this.config.chat_snag){let e=this.userName(t.userid),n="has snagged this track!";this.postToChat(e,n,"snag")}},t.alertJoin=function(t){if(this.config.chat_join){let e=t.user[0].name;this.postToChat(e,"joined.","join")}},t.alertLeft=function(t){if(this.config.chat_left){let e=t.user[0].name;this.postToChat(e,"left.","left")}},t.on("pmmed",t.alertPm),t.on("speak",t.alertPing),t.on("snagged",t.alertSnag),t.on("tracked",t.alertSong),t.on("dropped",t.alertDrop),t.on("registered",t.alertJoin),t.on("deregistered",t.alertLeft)})(j),window.$tS=j,window.$tS.init()}(); \ No newline at end of file +!function(){var t,e,n=(t=function(t,e){t.exports={version:"5.4.0"}},function(n){return e||t(e={exports:{},parent:n},e.exports),e.exports});const i=t=>`\n
\n

\u2630 tS

\n ${a(t)}\n
\n
\n

\u2715 tS

\n ${l}\n ${d(t)}\n ${h(t)}\n ${r(t)}\n ${c(t)}\n ${u(t)}\n
\n`,s=(t,e,n)=>`\n \n`,o=(t,e)=>`\n \n`,a=t=>`\n ${s(t,"autobop","Autobop")}\n ${s(t,"nextdj","Next DJ Spot")}\n ${s(t,"pingdj","Wait For Ping")}\n`,l='\n
\n
Options
\n
Visual
\n
In Chat
\n
Notify
\n
\n',d=t=>`\n
\n

General Features

\n ${s(t,"autobop","Autobop")}\n ${s(t,"has_vol","Control Volume")}\n
\n ${s(t,"nextdj","Next DJ Spot")}\n ${s(t,"pingdj","Wait For Ping")}\n
\n`,h=t=>`\n
\n

Visual Options

\n ${o(t,"theme")}\n ${o(t,"style")}\n
\n ${s(t,"no_aud","Hide Audience")}\n ${s(t,"no_vid","Hide Player")}\n
\n`,r=t=>`\n
\n

Post Messages In Chat

\n ${s(t,"chat_song","Last Song Stats")}\n ${s(t,"chat_spun","Dropped DJ Stats")}\n
\n ${s(t,"chat_snag","User Snags")}\n ${s(t,"chat_join","User Joins")}\n ${s(t,"chat_left","User Leaves")}\n
\n`,c=t=>`\n
\n

Send Desktop Notifications

\n ${s(t,"ping_pm","On DMs")}\n ${s(t,"ping_chat","On Mentions")}\n ${s(t,"ping_song","On New Songs")}\n
\n`,u=t=>`\n
\n \u2714\ufe0e CLOSE\n v${t.config.version}\n \n \n Join me on the TT Discord\n \n \n
\n`;const g=(t,e,n)=>`${n?`${t}/${n}`:""+t}/${e}.css`,p=(t,e,n)=>{let i=document.createElement("link");i.classList.add("tS-"+(n||"core")),i.type="text/css",i.rel="stylesheet",i.href=g(t,e,n),document.head.append(i)},m=(t,e,n)=>{let i=$("link.tS-"+n);if(!e)return!!i.length&&i.remove();i.length?i.attr("href",g(t,e,n)):p(t,e,n)};const f="DOMSubtreeModified",_=()=>{let t=window.turntable.playlist;t.isFiltering&&t.clearSearchBar(),$("#queue-header").removeClass("normal").addClass("edit"),t.queue.batchEditMode()},v=()=>{let t=$("#playlist-header .text")[0],e=window.turntable.playlist.fileids.length,n=t.innerHTML.split("")[0];t.innerHTML=`${n} ${e}`},b=()=>{if($(".profile.modal .statslink").length)return;let t=$(".profile.modal .userid"),e=t.length?t[0].innerHTML:"";24==e.length&&$(".profile.modal .section.web-links").before(w(e))},w=t=>`\n
\n \n View This Profile On ttStats >>\n \n
\n`;const y=t=>Math.log(t/100)/Math.LN2+4,j=t=>{let e=t||window.util.getSetting("volume");return 100*Math.pow(2,e-4)},k=`\n
\n \n \n \n Muted For One Song\n
\n`;const S=()=>{$(window).focus();let t={bubbles:!0,cancelable:!0,view:window},e=document.querySelectorAll(".awesome-button")[0],n=new MouseEvent("click",t);return!e.dispatchEvent(n)};const x=(t,e,n="")=>`\n
\n \n ${t}\n ${e}\n \n
\n`;const N={};(t=>{t.Log=t=>console.info("turnStyles :: "+t),t.user=()=>window.turntable.user,t.view=()=>window.turntable.topViewController,t.icon=()=>this.__base+"/images/icon128.png",t.userName=e=>{let n=t.view().userMap[e];return n?n.attributes.name:"Someone"},t.buddyName=t=>{let e=window.turntable.buddyList.pmWindows[t];return!!e&&e.otherUser.attributes.name},t.pinged=e=>{let n="@"+t.user().attributes.name.toLowerCase();return e.toLowerCase().indexOf(n)>-1},t.toggleClass=(t,e)=>{let n=$("body").hasClass(t);e&&!n&&$("body").addClass(t),n&&!e&&$("body").removeClass(t)},t.holding={},t.suspend=function(t,e,n){this.holding[n]?clearTimeout(this.holding[n]):t&&t();let i=1e3*e;this.holding[n]=setTimeout((()=>{delete this.holding[n]}).bind(this),i)}})(N),(t=>{t.on=function(t,e){this.events[t]||(this.events[t]=[]),this.events[t].push(e.bind(this))},t.emit=function(t,e,n){let i=this.events[t];if(i)for(let s of i)s(e,n)},t.handle=function(t){t.command&&this.emit(t.command,t)},t.events={}})(N),(t=>{t.default={theme:"dark",style:"",autobop:!0,nextdj:!1,pingdj:!1,has_vol:!1,no_aud:!1,no_vid:!1,ping_pm:!1,ping_song:!1,ping_chat:!1,chat_song:!1,chat_spun:!1,chat_snag:!1,chat_join:!1,chat_left:!1},t.options={theme:{dark:"Dark Mode",night:"Night Mode",cosmic:"Cosmic",midnight:"Midnight"},style:{pink:"Pink",blue:"Blue",teal:"Teal",green:"Green",purple:"Purple"}},t.saveConfig=function(t){let e="checkbox"==t.target.type,n=t.target.id.split("ts_").join(""),i=e?t.target.checked:t.target.value;$(`#ts_hotbar #${t.target.id}, #ts_window #${t.target.id}`).prop(e?"checked":"value",i),this.config[n]=i;let s=JSON.stringify(this.config);window.localStorage.setItem("tsdb",s),this.Log("saved config");let o="style"==n||"theme"==n;this.lobby?o&&this.updateThemes(n,i):this.emit("update",n,i)}})(N),(t=>{t.last_played={},t.now_playing={},t.current_djs={},t.buildCache=function(t){for(let e of t.djids)this.cacheNewDJ(e);this.cacheTrack(t.currentSong)},t.cacheTrack=function(t){let e=t&&t.room?t.room.metadata.current_song:t,n=t&&t.upvoters?t.upvoters.length:0,i=!!e&&e.djid,s={...this.now_playing},o={love:n,hate:0,snag:0,dj:i};this.last_played=s,this.now_playing=e?{...e.metadata,...o}:{},s.song&&this.current_djs[s.dj]?(this.current_djs[s.dj].spun+=1,this.current_djs[s.dj].love+=s.love,this.current_djs[s.dj].hate+=s.hate,this.current_djs[s.dj].snag+=s.snag):s.song&&this.cacheNewDJ(s.dj,s);let a=!1;s.song&&(a=`${s.love}\u2764\ufe0f${s.hate}\ud83d\udc94${s.snag}\ud83d\udc96`),this.emit("tracked",a),this.Log("cached track: "+(this.now_playing.song||"nosong"))},t.cacheNewDJ=function(t,e){let n=t.user?t.user[0].userid:t;this.current_djs[n]||(this.current_djs[n]={spun:e&&e.spun?e.spun:0,love:e&&e.love?e.love:0,hate:e&&e.hate?e.hate:0,snag:e&&e.snag?e.snag:0}),this.Log("cached new DJ: "+n)},t.cacheSnags=function(){this.now_playing.snag+=1},t.cacheVotes=function(t){this.now_playing.love=t.room.metadata.upvotes,this.now_playing.hate=t.room.metadata.downvotes},t.clearOldDJ=function(t){let e=t.user[0].name,n=t.user[0].userid;if(!this.current_djs[n])return;let i={...this.current_djs[n]},s=`${i.love}\u2764\ufe0f${i.hate}\ud83d\udc94${i.snag}\ud83d\udc96${i.spun}\u25b6\ufe0f`;delete this.current_djs[n],this.emit("dropped",e,s)},t.on("attach",t.buildCache),t.on("add_dj",t.cacheNewDJ),t.on("rem_dj",t.clearOldDJ),t.on("nosong",t.cacheTrack),t.on("newsong",t.cacheTrack),t.on("snagged",t.cacheSnags),t.on("update_votes",t.cacheVotes)})(N),(t=>{t.init=function(){if(this.__base)return;this.chrome=!!window.tsBase,this.__base=window.tsBase||"https://ts.pixelcrisis.co/build";let t=window.localStorage.getItem("tsdb"),e=t?JSON.parse(t):{},i=n({}).version;this.config={...this.default,...e,version:i},this.emit("loaded",this.config),this.attach()},t.attach=function(){let n=window.turntable;if(!n)return this.Log("no room");if(this.lobby=$("#turntable #topBG").length,this.lobby)return this.buildWindow();let i=()=>setTimeout(t.attach.bind(this),150);if(!n.user)return i();let s=e(n,"roomId");return s&&e(s,"roomData")?(this.realVolume=window.turntablePlayer.realVolume,n.addEventListener("message",this.handle.bind(this)),this.emit("attach",s),void this.Log("loaded room")):i()};const e=function(t,e){for(let n in t){let i=t[n];if(null!=i&&i[e])return i}}})(N),(t=>{t.buildWindow=function(){$(".header-bar").append(i(this)),$(".ts_menu").on("click",()=>{$("#ts_hotbar, #ts_window").toggleClass("active")}),$("#ts_tabs div").on("click",t=>{$("#ts_tabs div, .ts_tab").removeClass("active"),$("."+t.currentTarget.className).addClass("active")}),$(".ts_option").on("change",t.saveConfig.bind(this))},t.on("attach",t.buildWindow)})(N),(t=>{t.loadThemes=function(t){p(this.__base,"turnStyles"),this.updateThemes("theme",t.theme),this.updateThemes("style",t.style)},t.updateThemes=function(t,e){"theme"==t&&m(this.__base,e,"themes"),"style"==t&&m(this.__base,e,"styles")},t.on("loaded",t.loadThemes),t.on("update",t.updateThemes)})(N),(t=>{t.modify=function(){$("#songs-wrapper").on(f,"#songs",v),v(),$("#maindiv").on(f,".overlay .profile",b),this.hidden("no_vid",this.config.no_vid),this.hidden("no_aud",this.config.no_aud),$("#upload-button").after('
'),$("#ts_upload").on("click",_)},t.hidden=function(t,e){"no_vid"==t&&this.toggleClass("ts_hide_videos",e),"no_aud"==t&&this.toggleClass("ts_hide_audience",e)},t.on("attach",t.modify),t.on("update",t.hidden)})(N),(t=>{t.loadVolume=function(){let t=this.config.has_vol,e=$("body").hasClass("has-volume");this.toggleClass("has-volume",t),e&&!t&&this.remVolume(),t&&!e&&this.addVolume()},t.addVolume=function(){$(".header-content").append(k),$("#ts_mute").on("click",this.toggleMute.bind(this)),$("#ts_slider").on("input",this.saveVolume.bind(this)),$("#ts_slider").on("DOMMouseScroll mousewheel",this.onVolWheel.bind(this))},t.remVolume=function(){$("#ts_volume").remove(),window.turntablePlayer.realVolume=this.realVolume},t.saveVolume=function(t){let e=(t=t.target?t.target.value:t)>0?y(t):-3;window.turntablePlayer.realVolume=e>6?this.realVolume:j,window.turntablePlayer.setVolume(e),window.util.setSetting("volume",e)},t.onVolWheel=function(t){const e=j();let n=t.originalEvent.shiftKey?1:5,i=t.originalEvent.deltaY>0?e-n:e+n;return i=i<0?0:i>100?100:i,$("#ts_slider")[0].value=i,this.saveVolume(i),!1},t.checkMuted=function(){this.mute&&this.toggleMute()},t.toggleMute=function(){this.mute=!this.mute,$("#ts_volume").toggleClass("muted",this.mute);let t=this.mute?-3:y(j());window.turntablePlayer.setVolume(t),this.Log("turned mute "+(this.mute?"on":"off"))},t.on("attach",t.loadVolume),t.on("update",t.loadVolume),t.on("nosong",t.checkMuted),t.on("newsong",t.checkMuted)})(N),(t=>{t.autoBop=function(){if(this.bopping&&clearTimeout(this.bopping),!this.config.autobop)return;let t=7*Math.random()*100;this.bopping=setTimeout(S,t)},t.on("attach",t.autoBop),t.on("newsong",t.autoBop)})(N),(t=>{t.checkDecks=function(){this.config.nextdj&&(this.config.pingdj?this.suspend(null,2,"nextdj"):this.tryJumping())},t.tryJumping=function(){if(!$(".become-dj").length)return this.Log("nextdj: no spot");this.Log("nextdj: taking spot"),this.view().becomeDj()},t.isSpinning=function(t){if(!this.config.nextdj)return;if(this.user().id!=t.user[0].userid)return;this.config.nextdj=!1,$("#ts_hotbar #ts_nextdj").prop("checked",!1),$("#ts_hotbar #ts_nextdj").trigger("change");let e="You've Hopped On Deck!",n="NextDJ is now disabled.";this.sendNotify({head:e,text:n}),this.postToChat(e,n)},t.nextOnPing=function(t){this.pinged(t.text)&&this.holding.nextdj&&this.tryJumping()},t.on("attach",t.checkDecks),t.on("update",t.checkDecks),t.on("rem_dj",t.checkDecks),t.on("add_dj",t.isSpinning),t.on("speak",t.nextOnPing)})(N),(t=>{t.notifyAuth=function(){let t=this.config;return!(!(t.ping_chat||t.ping_pm||t.ping_song)||this.chrome||!("Notification"in window)||"denied"===Notification.permission||"default"===Notification.permission&&(this.Log("requesting notifcation permission"),Notification.requestPermission(),1))},t.stopNotify=function(){return!!document.hasFocus()||!this.chrome&&!this.notifyAuth()},t.sendNotify=function(t,e){if(this.stopNotify())return;let n=this.notifyType(t);return e?this.suspend(n,5,e):n()},t.notifyType=function(t){let e={type:"tsNotify",notification:t},n={icon:this.icon(),body:t.text};return this.chrome?()=>window.postMessage(e):()=>{let e=new Notification(t.head,n);e.onclick=()=>{window.focus(),e.close()}}},t.postToChat=function(t,e,n){$(".chat .messages").append(x(t,e,n)),this.view().updateChatScroll()},t.on("attach",t.notifyAuth),t.on("update",t.notifyAuth)})(N),(t=>{t.alertSong=function(t){let e=this.now_playing.song;if(e&&this.config.ping_song){let n="Now Playing: "+e,i=t||"By: "+this.now_playing.artist;this.sendNotify({head:n,text:i})}if(t&&this.config.chat_song){let e=this.last_played,n=`${e.song} by ${e.artist}`;this.postToChat(t,n,"stat")}},t.alertDrop=function(t,e){if(this.config.chat_spun){let n=`${t} - ${e}`,i="- is done spining!";this.postToChat(n,i,"stat")}},t.alertPm=function(t){if(this.config.ping_pm){let e=this.buddyName(t.senderid),n=e?"New PM from: "+e:"New PM";this.sendNotify({head:n,text:t.text},"ping_pm")}},t.alertPing=function(t){if(this.pinged(t.text)&&this.config.ping_chat){let e=`[${this.view().roomData.name}] @${t.name}`;this.sendNotify({head:e,text:t.text},"ping_chat")}},t.alertSnag=function(t){if(this.config.chat_snag){let e=this.userName(t.userid),n="has snagged this track!";this.postToChat(e,n,"snag")}},t.alertJoin=function(t){if(this.config.chat_join){let e=t.user[0].name;this.postToChat(e,"joined.","join")}},t.alertLeft=function(t){if(this.config.chat_left){let e=t.user[0].name;this.postToChat(e,"left.","left")}},t.on("pmmed",t.alertPm),t.on("speak",t.alertPing),t.on("snagged",t.alertSnag),t.on("tracked",t.alertSong),t.on("dropped",t.alertDrop),t.on("registered",t.alertJoin),t.on("deregistered",t.alertLeft)})(N),window.$tS=N,window.$tS.init()}(); \ No newline at end of file diff --git a/package.json b/package.json index 5a1842e..4d3a7a9 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "turnStyles", - "version": "5.3.5", + "version": "5.4.0", "main": "turnStyles.js", "repository": "git@github.com:pixelcrisis/turntable-tweaks.git", "author": "pixelcrisis ", diff --git a/public/manifest.json b/public/manifest.json index 796636a..bca7098 100644 --- a/public/manifest.json +++ b/public/manifest.json @@ -1,6 +1,6 @@ { "name": "turnStyles for turntable.fm", - "version": "5.3.5", + "version": "5.4.0", "description": "Apply tweaks to turntable.fm - autobop, autodj, themes, styles, and more!", "manifest_version": 2, "icons": {