Skip to content

Commit

Permalink
Merge pull request #160 from himanshu8443/feature
Browse files Browse the repository at this point in the history
Feature
  • Loading branch information
Zenda-Cross authored Dec 7, 2024
2 parents 0e576b0 + d2599a9 commit cdb6b1a
Show file tree
Hide file tree
Showing 26 changed files with 549 additions and 53 deletions.
4 changes: 2 additions & 2 deletions android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -86,8 +86,8 @@ android {
applicationId "com.vega"
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 80
versionName "2.5.5"
versionCode 82
versionName "2.5.6"
}
signingConfigs {
release {
Expand Down
4 changes: 2 additions & 2 deletions app.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,12 @@
]
],
"slug": "vega",
"version": "2.5.5",
"version": "2.5.6",
"sdkVersion": "51.0.0",
"android": {
"minSdkVersion": 24,
"package": "com.vega",
"versionCode": 80
"versionCode": 82
},
"platforms": ["ios", "android"]
}
Expand Down
12 changes: 6 additions & 6 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "vega",
"version": "2.5.5",
"version": "2.5.6",
"private": true,
"scripts": {
"android": "react-native run-android",
Expand All @@ -10,7 +10,7 @@
"test": "jest"
},
"dependencies": {
"@8man/react-native-media-console": "^2.2.4-alpha.14",
"@8man/react-native-media-console": "^2.2.4-alpha.16",
"@dominicvonk/react-native-apk-installer": "^2.2.2",
"@gorhom/bottom-sheet": "^4.6.4",
"@notifee/react-native": "^7.8.2",
Expand Down
2 changes: 1 addition & 1 deletion src/components/SeasonList.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -415,7 +415,7 @@ const SeasonList = ({
)}
{LinkList?.length === 0 && (
<Text className="text-white text-lg font-semibold min-h-20">
No streams found
No stream found
</Text>
)}
</View>
Expand Down
4 changes: 4 additions & 0 deletions src/lib/Manifest.ts
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@ import {cinemaLuxe} from './providers/cinemaLuxe';
import {animeRulzProvider} from './providers/animeRulz';
import {moviesApi} from './providers/moviesApi';
import {guardahd} from './providers/guardahd';
import {toonstream} from './providers/toonstream';
import {ridoMovies} from './providers/ridoMovies';

export interface ProviderType {
searchFilter?: string;
Expand Down Expand Up @@ -90,4 +92,6 @@ export const manifest: Manifest = {
animeRulz: animeRulzProvider,
moviesApi: moviesApi,
guardahd: guardahd,
toonstream: toonstream,
ridoMovies: ridoMovies,
};
16 changes: 14 additions & 2 deletions src/lib/constants.ts
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ export const providersList: ProvidersList[] = [
flag: '🌏',
},
{
name: 'ModMovies',
name: 'MoviesMod',
value: 'mod',
type: 'global',
flag: '🌏',
Expand Down Expand Up @@ -92,11 +92,23 @@ export const providersList: ProvidersList[] = [
flag: '🌏',
},
// {
// name: 'ToonStream',
// value: 'toonstream',
// type: 'global',
// flag: '🌏',
// },
// {
// name: 'MoviesApi',
// value: 'moviesApi',
// type: 'english',
// flag: '🇬🇧',
// },
{
name: 'RidoMovies',
value: 'ridoMovies',
type: 'english',
flag: '🇬🇧',
},
{
name: 'FlixHQ',
value: 'flixhq',
Expand Down Expand Up @@ -158,7 +170,7 @@ export const providersList: ProvidersList[] = [
flag: '🇮🇳',
},
{
name: 'LuxMovies',
name: 'RogMovies',
value: 'lux',
type: 'india',
flag: '🇮🇳',
Expand Down
39 changes: 39 additions & 0 deletions src/lib/providers/guardahd/guardahdGetPosts.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
import axios from 'axios';
import {headers} from '../headers';
import {Post} from '../types';

export const guardahdGetSearchPosts = async function (
searchQuery: string,
page: number,
providerValue: string,
signal: AbortSignal,
): Promise<Post[]> {
try {
if (page > 1) {
return [];
}
const catalog: Post[] = [];
const url2 = `https://v3-cinemeta.strem.io/catalog/movie/top/search=${encodeURI(
searchQuery,
)}.json`;
const res2 = await axios.get(url2, {headers, signal});
const data2 = res2.data;
data2?.metas.map((result: any) => {
const title = result?.name || '';
const id = result?.imdb_id || result?.id;
const image = result?.poster;
const type = result?.type;
if (id) {
catalog.push({
title: title,
link: `https://v3-cinemeta.strem.io/meta/${type}/${id}.json`,
image: image,
});
}
});
return catalog;
} catch (err) {
console.error('AutoEmbed error ', err);
return [];
}
};
5 changes: 3 additions & 2 deletions src/lib/providers/guardahd/index.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import {guardahdCatalog, guardahdGenresList} from './guardahdCatalog';
import {allGetInfo} from '../autoEmbed/allGetInfo';
import {allGetPost, allGetSearchPosts} from '../autoEmbed/allGetPost';
import {allGetPost} from '../autoEmbed/allGetPost';
import {guardahdGetSearchPosts} from './guardahdGetPosts';
import {ProviderType} from '../../Manifest';
import {GuardahdGetStream} from './GetGuardahdStream';

Expand All @@ -10,5 +11,5 @@ export const guardahd: ProviderType = {
GetMetaData: allGetInfo,
GetHomePosts: allGetPost,
GetStream: GuardahdGetStream,
GetSearchPosts: allGetSearchPosts,
GetSearchPosts: guardahdGetSearchPosts,
};
2 changes: 1 addition & 1 deletion src/lib/providers/luxMovies/headers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ export const headers = {
'Sec-Fetch-Site': 'none',
'Sec-Fetch-User': '?1',
Cookie:
'cf_clearance=zre97fLPyk9GTUfuqbfZvXPU5zDN4BE3nnkMxE7767Y-1723609417-1.0.1.1-YD4.GJqqAhcctS4bOpgW8ZmD9pLzASAaHbUl9ROEN.SmbMhisTm8nf8PO6T9wfy59UE0ozdWr0BGTF7F7UdvrA',
'ext_name=ojplmecpdpgccookcobabopnaifgidhf; cf_clearance=gaIhTNzqSvp27JCVf7qiEUfYRfwyj0Jx9rcsn774BbE-1732694853-1.2.1.1-QKgYJvmrEz08gM9qbAp70diztE2.hseO2NNi.0imIUk_gkuWUcr7U8t5Zn_z4Ov30sIGPBES1PBgMUEa.s8e8QTkQoZjgziFmoC7YdX7s2Jnt.tYCxE_s5mMLQQBYbz_94A89IYe93Y6kyLQm_L.dvUKPPiGjn_sH3qRD0g4p9oOl0SPvH0T2W_EaD0r6mVBasbgro9dAROt_6CxshXOEGeMOnoWR.ID699FKldjMUhbXJbATAffdOY6kf2sD_iwrSl4bcetTlDHd4gusTVfxSS1pL5qNjyTU9wa38soPl1wZoqFHkEGOPWz6S7FD5ikHxX0bArFem9hiDeJXctYfWz5e_Lkc6lH7nW0Rm2XS3gxCadQSg21RkSReN6kDAEecqjgJSE4zUomkWAxFZ98TSShgGWC0ridPTpdQizPDZQ; _lscache_vary=c1d682536aea2d88fbb2574666e1f0aa',
'Upgrade-Insecure-Requests': '1',
'User-Agent':
'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36 Edg/120.0.0.0',
Expand Down
4 changes: 2 additions & 2 deletions src/lib/providers/mod/modGetStream.ts
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ export const modGetStream = async (
const $cfWorkers = cheerio.load(cfWorkersHtml);
const cfWorkersStream = $cfWorkers('.btn-success');
cfWorkersStream.each((i, el) => {
const link = $(el).attr('href');
const link = el.attribs.href;
if (link) {
servers.push({
server: 'Cf Worker 1.' + i,
Expand All @@ -143,7 +143,7 @@ export const modGetStream = async (
const $cfWorkers = cheerio.load(cfWorkersHtml);
const cfWorkersStream = $cfWorkers('.btn-success');
cfWorkersStream.each((i, el) => {
const link = $(el).attr('href');
const link = el.attribs.href;
if (link) {
servers.push({
server: 'Cf Worker 2.' + i,
Expand Down
2 changes: 1 addition & 1 deletion src/lib/providers/multi/multiGetStream.ts
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ export const multiGetStream = async (
const $$ = cheerio.load(iframeRes.data);
let newIframeUrl =
$$('.linkserver').first().attr('data-video') ||
$$('#videoLinks').children().first().attr('data-link');
$$('[data-sourcekey=smwh]').attr('data-link');
console.log('newIframeUrl', newIframeUrl);
if (newIframeUrl) {
ifameUrl = newIframeUrl;
Expand Down
2 changes: 1 addition & 1 deletion src/lib/providers/netflixMirror/nfGetCookie.ts
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ export class NetMirrorCookieFetcher {
): Promise<void> {
try {
await fetch(
`https://userverify.netmirror.app/verify?dp1=${addhash}&a=y&t=${Math.random()}`,
`https://userverify.netmirror.app/verify?vhfd=${addhash}&a=y&t=${Math.random()}`,
{credentials: 'omit'},
);
} catch (err) {
Expand Down
15 changes: 15 additions & 0 deletions src/lib/providers/ridoMovies/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
import {ProviderType} from '../../Manifest';
import {guardahdCatalog, guardahdGenresList} from '../guardahd/guardahdCatalog';
import {allGetPost} from '../autoEmbed/allGetPost';
import {guardahdGetSearchPosts} from '../guardahd/guardahdGetPosts';
import {ridoGetInfo} from './ridoGetMeta';
import {ridoGetStream} from './ridoGetSream';

export const ridoMovies: ProviderType = {
catalog: guardahdCatalog,
genres: guardahdGenresList,
GetMetaData: ridoGetInfo,
GetHomePosts: allGetPost,
GetStream: ridoGetStream,
GetSearchPosts: guardahdGetSearchPosts,
};
112 changes: 112 additions & 0 deletions src/lib/providers/ridoMovies/ridoGetMeta.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,112 @@
import axios from 'axios';
import {EpisodeLink, Info, Link} from '../types';
import {getBaseUrl} from '../getBaseUrl';

export const ridoGetInfo = async function (link: string): Promise<Info> {
try {
console.log('all', link);
const res = await axios.get(link);
const data = res.data;
const meta = {
title: '',
synopsis: '',
image: '',
imdbId: data?.meta?.imdb_id || '',
type: data?.meta?.type || 'movie',
};

const baseUrl = await getBaseUrl('ridomovies');
let slug = '';
try {
const res2 = await axios.get(
baseUrl + '/core/api/search?q=' + meta.imdbId,
);
const data2 = res2.data;
console.log('all', data2);
slug = data2?.data?.items[0]?.fullSlug;
if (!slug || meta?.type === 'series') {
return {
title: '',
synopsis: '',
image: '',
imdbId: data?.meta?.imdb_id || '',
type: meta?.type || 'movie',
linkList: [],
};
}
} catch (err) {
console.error('ridoGetInfo', err);
return {
title: '',
synopsis: '',
image: '',
imdbId: meta?.imdbId || '',
type: meta?.type || 'movie',
linkList: [],
};
}

const links: Link[] = [];
let directLinks: EpisodeLink[] = [];
let season = new Map();
if (meta.type === 'series') {
data?.meta?.videos?.map((video: any) => {
if (video?.season <= 0) return;
if (!season.has(video?.season)) {
season.set(video?.season, []);
}

season.get(video?.season).push({
title: 'Episode ' + video?.episode,
type: 'series',
link: JSON.stringify({
season: video?.id?.split(':')[1],
episode: video?.id?.split(':')[2],
type: data?.meta?.type,
slug: slug,
baseUrl: baseUrl,
}),
});
});
const keys = Array.from(season.keys());
keys.sort();
keys.map(key => {
directLinks = season.get(key);
links.push({
title: `Season ${key}`,
directLinks: directLinks,
});
});
} else {
console.log('all meta Mv🔥🔥', meta);
links.push({
title: data?.meta?.name as string,
directLinks: [
{
title: 'Movie',
type: 'movie',
link: JSON.stringify({
type: data?.meta?.type,
slug: slug,
baseUrl: baseUrl,
}),
},
],
});
}
return {
...meta,
linkList: links,
};
} catch (err) {
console.error('ridoGetInfo', err);
return {
title: '',
synopsis: '',
image: '',
imdbId: '',
type: 'movie',
linkList: [],
};
}
};
Loading

0 comments on commit cdb6b1a

Please sign in to comment.