evan/deemixer
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Major code rework

Browse Source
This commit is contained in:
RemixDev
2022-02-05 01:15:26 +01:00
parent 5d29424c3a
commit 87164f0644
49 changed files with 562 additions and 927 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server/src/routes/api/get/albumSearch.ts
View File

@@ -3,7 +3,7 @@ import type { RequestHandler } from 'express'
import { Deezer } from 'deezer-js'
import type { ApiHandler } from '../../../types'
import { sessionDZ } from '../../../main'
import { sessionDZ } from '../../../app'
export interface RawAlbumQuery {
term: string

2
server/src/routes/api/get/analyzeLink.ts
View File

@@ -5,7 +5,7 @@ import deemix from 'deemix'
import { Deezer } from 'deezer-js'
import type { ApiHandler, GetTrackResponse, GetAlbumResponse } from '../../../types'
import { sessionDZ } from '../../../main'
import { sessionDZ } from '../../../app'
export interface AnalyzeQuery {
term?: string

8
server/src/routes/api/get/checkForUpdates.ts
View File

@@ -1,13 +1,13 @@
import { ApiHandler } from '../../../types'
import { getLatestVersion, isUpdateAvailable } from '../../../main'
const path: ApiHandler['path'] = '/checkForUpdates'
const handler: ApiHandler['handler'] = async (_, res) => {
const latestCommit = await getLatestVersion()
const handler: ApiHandler['handler'] = async (req, res) => {
const deemix = req.app.get('deemix')
const latestCommit = await deemix.getLatestVersion()
res.send({
latestCommit,
updateAvailable: isUpdateAvailable()
updateAvailable: deemix.isUpdateAvailable()
})
}

2
server/src/routes/api/get/getChartTracks.ts
View File

@@ -2,7 +2,7 @@ import { RequestHandler } from 'express'
// @ts-expect-error
import { Deezer } from 'deezer-js'
import { ApiHandler } from '../../../types'
import { sessionDZ } from '../../../main'
import { sessionDZ } from '../../../app'
import { isObjectEmpy } from '../../../helpers/primitive-checks'
import { BadRequestError, isBadRequestError, consoleError } from '../../../helpers/errors'

2
server/src/routes/api/get/getCharts.ts
View File

@@ -1,7 +1,7 @@
// @ts-expect-error
import { Deezer } from 'deezer-js'
import { ApiHandler } from '../../../types'
import { sessionDZ } from '../../../main'
import { sessionDZ } from '../../../app'
const path: ApiHandler['path'] = '/getCharts'

2
server/src/routes/api/get/getHome.ts
View File

@@ -1,7 +1,7 @@
// @ts-expect-error
import { Deezer } from 'deezer-js'
import { ApiHandler } from '../../../types'
import { sessionDZ } from '../../../main'
import { sessionDZ } from '../../../app'
const path: ApiHandler['path'] = '/getHome'

6
server/src/routes/api/get/getQueue.ts
View File

@@ -1,13 +1,13 @@
// import { Deezer } from 'deezer-js'
import { ApiHandler } from '../../../types'
import { getQueue } from '../../../main'
const path: ApiHandler['path'] = '/getQueue'
// let homeCache: any
const handler: ApiHandler['handler'] = (_, res) => {
const result: any = getQueue()
const handler: ApiHandler['handler'] = (req, res) => {
const deemix = req.app.get('deemix')
const result: any = deemix.getQueue()
res.send(result)
}

6
server/src/routes/api/get/getSettings.ts
View File

@@ -1,10 +1,10 @@
import { ApiHandler } from '../../../types'
import { getSettings } from '../../../main'
const path: ApiHandler['path'] = '/getSettings'
const handler: ApiHandler['handler'] = (_, res) => {
res.send(getSettings())
const handler: ApiHandler['handler'] = (req, res) => {
const deemix = req.app.get('deemix')
res.send(deemix.getSettings())
}
const apiHandler: ApiHandler = { path, handler }

7
server/src/routes/api/get/getTracklist.ts
View File

@@ -1,13 +1,14 @@
// @ts-expect-error
import { Deezer } from 'deezer-js'
import { ApiHandler } from '../../../types'
import { sessionDZ, plugins } from '../../../main'
import { sessionDZ } from '../../../app'
const path: ApiHandler['path'] = '/getTracklist'
const handler: ApiHandler['handler'] = async (req, res) => {
if (!sessionDZ[req.session.id]) sessionDZ[req.session.id] = new Deezer()
const dz = sessionDZ[req.session.id]
const deemix = req.app.get('deemix')
const list_id = String(req.query.id)
const list_type = String(req.query.type)
@@ -20,7 +21,7 @@ const handler: ApiHandler['handler'] = async (req, res) => {
}
case 'spotifyplaylist':
case 'spotify_playlist': {
if (!plugins.spotify.enabled) {
if (!deemix.plugins.spotify.enabled) {
res.send({
collaborative: false,
description: '',
@@ -40,7 +41,7 @@ const handler: ApiHandler['handler'] = async (req, res) => {
})
break
}
const sp = plugins.spotify.sp
const sp = deemix.plugins.spotify.sp
let playlist = await sp.getPlaylist(list_id)
playlist = playlist.body
let tracklist = playlist.tracks.items

2
server/src/routes/api/get/getUserAlbums.ts
View File

@@ -1,7 +1,7 @@
// @ts-expect-error
import { Deezer } from 'deezer-js'
import { ApiHandler } from '../../../types'
import { sessionDZ } from '../../../main'
import { sessionDZ } from '../../../app'
const path: ApiHandler['path'] = '/getUserAlbums'

2
server/src/routes/api/get/getUserArtists.ts
View File

@@ -1,7 +1,7 @@
// @ts-expect-error
import { Deezer } from 'deezer-js'
import { ApiHandler } from '../../../types'
import { sessionDZ } from '../../../main'
import { sessionDZ } from '../../../app'
const path: ApiHandler['path'] = '/getUserArtists'

2
server/src/routes/api/get/getUserFavorites.ts
View File

@@ -1,7 +1,7 @@
// @ts-expect-error
import { Deezer } from 'deezer-js'
import { ApiHandler } from '../../../types'
import { sessionDZ } from '../../../main'
import { sessionDZ } from '../../../app'
const path: ApiHandler['path'] = '/getUserFavorites'

2
server/src/routes/api/get/getUserPlaylists.ts
View File

@@ -1,7 +1,7 @@
// @ts-expect-error
import { Deezer } from 'deezer-js'
import { ApiHandler } from '../../../types'
import { sessionDZ } from '../../../main'
import { sessionDZ } from '../../../app'
const path: ApiHandler['path'] = '/getUserPlaylists'

8
server/src/routes/api/get/getUserSpotifyPlaylists.ts
View File

@@ -1,13 +1,13 @@
import { ApiHandler } from '../../../types'
import { plugins } from '../../../main'
const path: ApiHandler['path'] = '/getUserSpotifyPlaylists'
const handler: ApiHandler['handler'] = async (req, res) => {
let data
const deemix = req.app.get('deemix')
if (plugins.spotify.enabled) {
const sp = plugins.spotify.sp
if (deemix.plugins.spotify.enabled) {
const sp = deemix.plugins.spotify.sp
const username = req.query.spotifyUser
data = []
let playlists = await sp.getUserPlaylists(username)
@@ -22,7 +22,7 @@ const handler: ApiHandler['handler'] = async (req, res) => {
playlistList = playlistList.concat(playlists.items)
}
playlistList.forEach((playlist: any) => {
data.push(plugins.spotify._convertPlaylistStructure(playlist))
data.push(deemix.plugins.spotify._convertPlaylistStructure(playlist))
})
} else {
data = { error: 'spotifyNotEnabled' }

2
server/src/routes/api/get/getUserTracks.ts
View File

@@ -1,7 +1,7 @@
// @ts-expect-error
import { Deezer } from 'deezer-js'
import { ApiHandler } from '../../../types'
import { sessionDZ } from '../../../main'
import { sessionDZ } from '../../../app'
const path: ApiHandler['path'] = '/getUserTracks'

2
server/src/routes/api/get/mainSearch.ts
View File

@@ -1,7 +1,7 @@
// @ts-expect-error
import { Deezer } from 'deezer-js'
import { ApiHandler } from '../../../types'
import { sessionDZ } from '../../../main'
import { sessionDZ } from '../../../app'
const path: ApiHandler['path'] = '/mainSearch'

2
server/src/routes/api/get/newReleases.ts
View File

@@ -1,7 +1,7 @@
// @ts-expect-error
import { Deezer } from 'deezer-js'
import { ApiHandler } from '../../../types'
import { sessionDZ } from '../../../main'
import { sessionDZ } from '../../../app'
import { getAlbumDetails } from './albumSearch'
const path: ApiHandler['path'] = '/newReleases'

2
server/src/routes/api/get/search.ts
View File

@@ -1,7 +1,7 @@
// @ts-expect-error
import { Deezer } from 'deezer-js'
import { ApiHandler } from '../../../types'
import { sessionDZ } from '../../../main'
import { sessionDZ } from '../../../app'
const path: ApiHandler['path'] = '/search'

6
server/src/routes/api/get/spotifyStatus.ts
View File

@@ -1,10 +1,10 @@
import { ApiHandler } from '../../../types'
import { plugins } from '../../../main'
const path: ApiHandler['path'] = '/spotifyStatus'
const handler: ApiHandler['handler'] = (_, res) => {
res.send({ spotifyEnabled: plugins.spotify.enabled })
const handler: ApiHandler['handler'] = (req, res) => {
const deemix = req.app.get('deemix')
res.send({ spotifyEnabled: deemix.plugins.spotify.enabled })
}
const apiHandler: ApiHandler = { path, handler }