diff --git a/addon/moch/alldebrid.js b/addon/moch/alldebrid.js index ed96ba1..f4ce239 100644 --- a/addon/moch/alldebrid.js +++ b/addon/moch/alldebrid.js @@ -3,7 +3,7 @@ import { Type } from '../lib/types.js'; import { isVideo, isArchive } from '../lib/extension.js'; import StaticResponse from './static.js'; import { getMagnetLink } from '../lib/magnetHelper.js'; -import { BadTokenError, AccessDeniedError, sameFilename, streamFilename } from './mochHelper.js'; +import { BadTokenError, AccessDeniedError, sameFilename, streamFilename, AccessBlockedError } from './mochHelper.js'; const KEY = 'alldebrid'; const AGENT = 'torrentio'; @@ -167,6 +167,9 @@ export function toCommonError(error) { if (error && error.code === 'AUTH_USER_BANNED') { return AccessDeniedError; } + if (error && error.code === 'AUTH_BLOCKED') { + return AccessBlockedError; + } return undefined; } diff --git a/addon/moch/moch.js b/addon/moch/moch.js index ddcc7eb..273e301 100644 --- a/addon/moch/moch.js +++ b/addon/moch/moch.js @@ -9,7 +9,7 @@ import * as putio from './putio.js'; import StaticResponse, { isStaticUrl } from './static.js'; import { cacheWrapResolvedUrl } from '../lib/cache.js'; import { timeout } from '../lib/promises.js'; -import { BadTokenError, streamFilename, AccessDeniedError, enrichMeta } from './mochHelper.js'; +import { BadTokenError, streamFilename, AccessDeniedError, enrichMeta, AccessBlockedError } from './mochHelper.js'; import { createNamedQueue } from "../lib/namedQueue.js"; const RESOLVE_TIMEOUT = 2 * 60 * 1000; // 2 minutes @@ -232,5 +232,12 @@ function errorStreamResponse(mochKey, error, config) { url: `${config.host}/${StaticResponse.FAILED_ACCESS}` }; } + if (error === AccessBlockedError) { + return { + name: `Torrentio\n${MochOptions[mochKey].shortName} error`, + title: `Access to ${MochOptions[mochKey].name} is blocked!\nCheck you account or email.`, + url: `${config.host}/${StaticResponse.FAILED_ACCESS}` + }; + } return undefined; } diff --git a/addon/moch/mochHelper.js b/addon/moch/mochHelper.js index 0e2da69..3d86766 100644 --- a/addon/moch/mochHelper.js +++ b/addon/moch/mochHelper.js @@ -3,6 +3,7 @@ import * as repository from '../lib/repository.js'; const METAHUB_URL = 'https://images.metahub.space' export const BadTokenError = { code: 'BAD_TOKEN' } export const AccessDeniedError = { code: 'ACCESS_DENIED' } +export const AccessBlockedError = { code: 'ACCESS_BLOCKED' } export function chunkArray(arr, size) { return arr.length > size