Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[pull] master from main #45

Merged
merged 2 commits into from
Dec 7, 2024
Merged

[pull] master from main #45

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e12009d
vast_msg
yumata Dec 6, 2024
1146710
Check Premium for vast_url
yumata Dec 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions app.min.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20630,13 +20630,14 @@
}

var Vast = /*#__PURE__*/function () {
function Vast(num, vast_url) {
function Vast(num, vast_url, vast_msg) {
_classCallCheck(this, Vast);

this.network = new create$f();
this.listener = start$8();
this.paused = false;
this.vast_url = vast_url;
this.vast_msg = vast_msg;
if (loaded_data.time < Date.now() + 1000 * 60 * 60 * 1) this.load();else if (loaded_data.ad.length) setTimeout(this.start.bind(this), 100);else this.load();
}

Expand Down Expand Up @@ -20690,6 +20691,7 @@
this.block.find('video').remove();
this.block.find('.ad-video-block__text').text(Lang.translate('ad') + ' - ' + Lang.translate('ad_disable')).toggleClass('hide', Boolean(this.vast_url));
this.block.find('.ad-video-block__info').text('');
if (this.vast_msg) this.block.find('.ad-video-block__text').text(this.vast_msg).toggleClass('hide', false);
var skip = this.block.find('.ad-video-block__skip');
var progressbar = this.block.find('.ad-video-block__progress-fill');
var player;
Expand Down Expand Up @@ -20835,6 +20837,7 @@
var next = 0;
var vast_api;
var vast_url;
var vast_msg;

function init$m() {
if (!(Platform.is('orsay') || Platform.is('netcast'))) {
Expand All @@ -20851,7 +20854,7 @@
function video(vast, num, started, ended) {
console.log('Ad', 'launch', vast ? 'vast' : 'video');
var Blok = vast ? Vast : VideoBlock;
var item = new Blok(num, vast_url);
var item = new Blok(num, vast_url, vast_msg);
item.listener.follow('launch', started);
item.listener.follow('ended', ended);

Expand Down Expand Up @@ -20912,8 +20915,9 @@
if (ac && ac.component == 'full' && ac.id == '1966') return launch(call);
if (window.god_enabled) return launch(call);

if (data.vast_url && typeof data.vast_url == 'string' && vast_api) {
if (data.vast_url && typeof data.vast_url == 'string' && vast_api && !Account.hasPremium()) {
vast_url = data.vast_url;
vast_msg = data.vast_msg;
return launch(call);
}

Expand Down