A clean and minimal youtube frontend, without all the ads and whistles
JavaScript
feat: basic exclude terms
Christian Feibbbef8f65abf
diff --git a/client/components/excluded-terms-form.js b/client/components/excluded-terms-form.jsnew file mode 100644index 0000000..019eb2e--- /dev/null+++ b/client/components/excluded-terms-form.js@@ -0,0 +1,83 @@+class ExcludedTermsForm extends HTMLElement {+ constructor () {+ super()+ }+ connectedCallback () {+ this.render()+ this.registerEvents()++ this.fetchExcludedTermsHandler()+ }+ disconnectedCallback () {+ this.unregisterEvents()+ }+ registerEvents () {+ this.querySelector('#add-excluded-term').addEventListener('keyup', this.addExcludedTermHandler.bind(this))+ }+ unregisterEvents () {+ this.querySelector('#add-excluded-term').removeEventListener('keyup', this.addExcludedTermHandler.bind(this))+ }+ render () {+ this.innerHTML = /*html*/`+ <div>+ <div class="flex space-between">+ <div>+ Excluded terms+ </div>+ <div id="excluded-terms">None currently</div>+ </div>+ <br>+ <div class="flex space-between">+ <label for="add-excluded-term">+ Add more terms to exclude+ </label>+ <input type="text" id="add-excluded-term" placeholder="Add excluded term" required />+ </div>+ </div>+ `+ }++ addExcludedTermHandler (event) {+ event.preventDefault()+ const term = event.target.value.trim()+ if (event.key === 'Enter' && term) {+ fetch('/api/excluded-terms', {+ method: 'POST',+ headers: { 'Content-Type': 'application/json' },+ body: JSON.stringify({term})+ })+ .then(() => {+ event.target.value = ''+ })+ .catch(console.error)+ .finally(this.fetchExcludedTermsHandler.bind(this))+ }+ }+ fetchExcludedTermsHandler () {+ fetch('/api/excluded-terms')+ .then(response => response.json())+ .then(data => {+ const $excludedTerms = this.querySelector('#excluded-terms')+ if (!$excludedTerms) return console.warn('missing #excluded-terms')+ if (data.length > 0) $excludedTerms.innerHTML = ''+ data.forEach(term => {+ const $li = document.createElement('li')+ $li.textContent = term+ $excludedTerms.appendChild($li)+ $li.addEventListener('click', () => {+ if (!confirm('Remove "' + term + '" from excluded terms?')) return+ fetch(`/api/excluded-terms`, {+ method: 'DELETE',+ headers: { 'Content-Type': 'application/json' },+ body: JSON.stringify({ term })+ })+ .then(() => $li.remove())+ .catch(error => {+ console.error(error)+ })+ })+ })+ })+ }+}+customElements.define('excluded-terms-form', ExcludedTermsForm)diff --git a/client/index.html b/client/index.htmlindex b5adcac..d609f05 100644--- a/client/index.html+++ b/client/index.html@@ -105,7 +105,12 @@</div></form><br>+ <excluded-terms-form></excluded-terms-form>+ <br><manage-channels-form></manage-channels-form>+ <br>+ <br>+ <br></div></template>@@ -127,6 +132,7 @@<script type="module" src="/components/video-quality-form.js"></script><script type="module" src="/components/manage-disk-space-form.js"></script><script type="module" src="/components/transcode-videos-form.js"></script>+ <script type="module" src="/components/excluded-terms-form.js"></script><script type="module" src="/main.js"></script><script type="module" src="/lib/router.js"></script></body>diff --git a/client/main.css b/client/main.cssindex 9204d31..64b2eb2 100644--- a/client/main.css+++ b/client/main.css@@ -177,6 +177,12 @@ input[type="text"], input[type="url"], input[type="search"] {border: 2px solid var(--details-border);}+#excluded-terms li {+ list-style-type: none;+ display: inline-block;+ padding: 0 0.4rem;+}+.loader {display: none;border: 2px solid var(--loader-border);diff --git a/lib/repository.js b/lib/repository.jsindex 7549d1e..e3aae0a 100644--- a/lib/repository.js+++ b/lib/repository.js@@ -21,7 +21,8 @@ export default class Repository {if (!fs.existsSync(this.paths.settings)) {fs.writeFileSync(this.paths.settings, JSON.stringify({videoQuality: 720,- transcodeVideos: true+ transcodeVideos: true,+ excludedTerms: []}, null, 2))}@@ -33,6 +34,10 @@ export default class Repository {console.error(err)}if (this.settings.transcodeVideos === undefined) { this.setTranscodeVideosSetting(true) }+ if (this.settings.excludedTerms === undefined) {+ this.settings.excludedTerms = []+ this.saveSettings+ }fs.readdirSync(`${this.basePath}/videos`).forEach(file => {const format = file.substring(file.lastIndexOf('.') + 1)@@ -66,8 +71,11 @@ export default class Repository {return this.videos}getVideos (query = {}) {+ const excludedTerms = this.getExcludedTerms()const isFiltering = Object.keys(query).length > 0 && query.filterlet videos = this.videos+ .filter(v =>+ !excludedTerms.some(term => v.title?.toLowerCase().includes(term) || v.description?.toLowerCase().includes(term))).filter(v => isFiltering ? true : !v.ignored).sort((a, b) => +new Date(b.publishedAt) - +new Date(a.publishedAt))@@ -178,4 +186,27 @@ export default class Repository {this.saveSettings()return this.settings.transcodeVideos}++ getExcludedTerms() {+ return this.settings.excludedTerms || []+ }+ addExcludedTerm(term = '') {+ if (!term) return+ term = term.trim()+ const excludedTerms = this.getExcludedTerms()+ if (!excludedTerms.includes(term) && term) {+ excludedTerms.push(term)+ this.settings.excludedTerms = excludedTerms+ this.saveSettings()+ }+ }+ removeExcludedTerm(term) {+ const excludedTerms = this.getExcludedTerms()+ const index = excludedTerms.indexOf(term)+ if (index >= 0) {+ excludedTerms.splice(index, 1)+ this.settings.excludedTerms = excludedTerms+ this.saveSettings()+ }+ }}\ No newline at end of filediff --git a/lib/router/api.js b/lib/router/api.jsindex 89c5223..6a5f22e 100644--- a/lib/router/api.js+++ b/lib/router/api.js@@ -53,6 +53,12 @@ export default function apiHandler(req, res, repo, connections = [], state = {})return getTranscodeVideosHandler(req, res, repo, connections)if (url.pathname === '/api/transcode-videos' && req.method === 'POST')return setTranscodeVideosHandler(req, res, repo, connections)+ if (url.pathname === '/api/excluded-terms' && req.method === 'GET')+ return getExcludedTermsHandler(req, res, repo, connections)+ if (url.pathname === '/api/excluded-terms' && req.method === 'POST')+ return addExcludedTermHandler(req, res, repo, connections)+ if (url.pathname === '/api/excluded-terms' && req.method === 'DELETE')+ return removeExcludedTermHandler(req, res, repo, connections)if (url.pathname.match(/\/api\/videos\/.*/) && req.method === 'GET')return watchVideoHandler(req, res, repo)if (url.pathname.match(/\/api\/captions\/.*/) && req.method === 'GET')@@ -256,6 +262,25 @@ async function reclaimDiskSpaceHandler(req, res, repo) {res.end()}+async function getExcludedTermsHandler(req, res, repo) {+ const excludedTerms = repo.getExcludedTerms()+ res.writeHead(200, { 'Content-Type': 'application/json' })+ res.end(JSON.stringify(excludedTerms))+}+async function addExcludedTermHandler(req, res, repo) {+ const body = await getBody(req)+ const term = JSON.parse(body).term+ repo.addExcludedTerm(term)+ res.writeHead(200)+ res.end()+}+async function removeExcludedTermHandler(req, res, repo) {+ const body = await getBody(req)+ const term = JSON.parse(body).term+ repo.removeExcludedTerm(term)+ res.writeHead(200)+ res.end()+}async function getTranscodeVideosHandler(req, res, repo) {let transcodeVideos = repo.getTranscodeVideosSetting()res.writeHead(200, { 'Content-Type': 'application/json' })diff --git a/lib/router/app.js b/lib/router/app.jsindex eebb5b1..fa6434f 100644--- a/lib/router/app.js+++ b/lib/router/app.js@@ -28,6 +28,8 @@ export default function apiHandler(req, res) {return fileHandler('client/components/manage-disk-space-form.js', 'application/javascript')(req, res)if (url.pathname === '/components/transcode-videos-form.js')return fileHandler('client/components/transcode-videos-form.js', 'application/javascript')(req, res)+ if (url.pathname === '/components/excluded-terms-form.js')+ return fileHandler('client/components/excluded-terms-form.js', 'application/javascript')(req, res)if (url.pathname === '/components/search-videos.js')return fileHandler('client/components/search-videos.js', 'application/javascript')(req, res)if (url.pathname === '/components/channels-list.js')diff --git a/test/repository.test.js b/test/repository.test.jsindex 36aa115..606f2e3 100644--- a/test/repository.test.js+++ b/test/repository.test.js@@ -28,6 +28,7 @@ describe('repository', () => {assert.equal(repo.getChannels().length, 1)assert.equal(repo.channelExists('veritasium'), true)})+test('delete channel', () => {repo.addChannel('veritasium')repo.deleteChannel('veritasium')@@ -125,6 +126,35 @@ describe('repository', () => {})})+describe('excluded terms', () => {+ test('gets excluded terms', () => {+ assert.deepEqual(repo.getExcludedTerms(), [])+ })++ test('adds excluded term', () => {+ repo.addExcludedTerm('trump')+ assert.deepEqual(repo.getExcludedTerms(), ['trump'])+ })++ test('avoids adding duplicate excluded term', () => {+ repo.addExcludedTerm('trump')+ assert.deepEqual(repo.getExcludedTerms(), ['trump'])+ repo.addExcludedTerm('trump')+ assert.deepEqual(repo.getExcludedTerms(), ['trump'])+ })++ test('removes term', () => {+ repo.addExcludedTerm('trump')+ assert.deepEqual(repo.getExcludedTerms(), ['trump'])+ repo.removeExcludedTerm('trump')+ assert.deepEqual(repo.getExcludedTerms(), [])+ })++ test('returns videos based on excluded terms', () => {++ })+})+describe('search', () => {test('searches videos by title', async () => {repo.upsertVideos([video1, video2])