fix source version detection in legacy/modern imports

Author: goto-bus-stop

src/controllers/import.js

@@ -1,6 +1,5 @@
 'use strict';
 
-const has = require('has');
 const {
   SourceNotFoundError,
   SourceNoImportError,
@@ -18,7 +17,7 @@ const getImportableSource = (req) => {
   if (!source) {
     throw new SourceNotFoundError({ name: sourceName });
   }
-  if (!has(source, 'import')) {
+  if (source.apiVersion >= 3) {
     throw new SourceNoImportError({ name: sourceName });
   }
 

src/controllers/sources.js

@@ -1,6 +1,5 @@
 'use strict';
 
-const has = require('has');
 const { BadRequest } = require('http-errors');
 const {
   SourceNotFoundError,
@@ -20,9 +19,6 @@ function getImportableSource(req) {
   if (!source) {
     throw new SourceNotFoundError({ name: sourceName });
   }
-  if (has(source, 'import')) {
-    throw new SourceNoImportError({ name: sourceName });
-  }
   if (source.apiVersion < 3) {
     throw new SourceNoImportError({ name: sourceName });
   }

src/source/Source.js

@@ -105,23 +105,17 @@ class LegacySourceWrapper {
 
   /**
    * Unsupported for legacy sources.
-   * @param {User} user
-   * @param {string} userID
-   * @returns {Promise<Page<unknown, {}>>}
+   * @returns {Promise<never>}
    */
-  // eslint-disable-next-line no-unused-vars
-  async getUserPlaylists(user, userID) {
+  async getUserPlaylists() {
     throw new SourceNoImportError({ name: this.type });
   }
 
   /**
    * Unsupported for legacy sources.
-   * @param {User} user
-   * @param {string} playlistID
-   * @returns {Promise<Page<PlaylistItemDesc, {}>>}
+   * @returns {Promise<never>}
    */
-  // eslint-disable-next-line no-unused-vars
-  async getPlaylistItems(user, playlistID) {
+  async getPlaylistItems() {
     throw new SourceNoImportError({ name: this.type });
   }
 
@@ -131,12 +125,13 @@ class LegacySourceWrapper {
    * doing.
    *
    * @param {User} user
-   * @param {unknown[]} args
+   * @param {{}} values
+   * @returns {Promise<unknown>}
    */
-  'import'(user, ...args) {
+  'import'(user, values) {
     const importContext = new ImportContext(this.uw, this, user);
     if (this.plugin.api === 2 && this.plugin.import != null) {
-      return this.plugin.import(importContext, ...args);
+      return this.plugin.import(importContext, values);
     }
     throw new SourceNoImportError({ name: this.type });
   }
@@ -256,8 +251,10 @@ class ModernSourceWrapper {
 
   /**
    * Unsupported for modern media sources.
+   *
+   * @returns {Promise<never>}
    */
-  'import'() {
+  async 'import'() {
     throw new SourceNoImportError({ name: this.type });
   }
 }

src/source/types.d.ts

@@ -42,4 +42,5 @@ export interface SourceWrapper {
   search(user: User, query: string, page?: JsonValue): Promise<Page<PlaylistItemDesc, JsonValue>>;
   getUserPlaylists(user: User, userID: string): Promise<Page<unknown, JsonValue>>;
   getPlaylistItems(user: User, playlistID: string): Promise<Page<PlaylistItemDesc, JsonValue>>;
+  import(user: User, params: {}): Promise<unknown>;
 }