Changed alert msg

This commit is contained in:
zeldaroot 2021-06-17 00:44:58 +03:00
parent 80185e10dc
commit 3c28eef255
6 changed files with 13 additions and 79 deletions

View File

@ -17,9 +17,9 @@ RUN npm install && npm run build && npm link
RUN mkdir /app
WORKDIR /app
RUN nativefier https://cinemapress.io /tmp/nativefier \
&& nativefier -p osx https://cinemapress.io /tmp/nativefier \
&& nativefier -p windows https://cinemapress.io /tmp/nativefier \
RUN nativefier https://github.com/CinemaPress/CinemaPress /tmp/nativefier \
&& nativefier -p osx https://github.com/CinemaPress/CinemaPress /tmp/nativefier \
&& nativefier -p windows https://github.com/CinemaPress/CinemaPress /tmp/nativefier \
&& rm -rf /tmp/nativefier
ENTRYPOINT ["nativefier"]

6
files/alert.json Normal file
View File

@ -0,0 +1,6 @@
[
{
"selector":"#alertCP",
"html":"<a href=\"https://hub.docker.com/r/cinemapress/docker\" target=\"_blank\"><i class=\"fab fa-docker\"></i></a>&nbsp;&nbsp;&nbsp;<a href=\"https://github.com/CinemaPress/CinemaPress\" target=\"_blank\"><i class=\"fab fa-github\"></i></a>&nbsp;&nbsp;&nbsp;<a href=\"https://gitlab.com/CinemaPress/CinemaPress\" target=\"_blank\"><i class=\"fab fa-gitlab\"></i></a>&nbsp;&nbsp;&nbsp;<a href=\"https://bitbucket.org/cinemapress/cinemapress/src/master/\" target=\"_blank\"><i class=\"fab fa-bitbucket\"></i></a>"
}
]

View File

@ -6,7 +6,7 @@
// @description:ru Кнопка автозаполнения информации о фильме в CinemaPress.
// @description:zh CinemaPress电影信息自动完成按钮。
// @author CinemaPress
// @homepageURL https://cinemapress.io/
// @homepageURL https://github.com/CinemaPress
// @supportURL https://enota.club/
// @icon https://avatars3.githubusercontent.com/u/16612433?s=200
// @license MIT

View File

@ -3,7 +3,7 @@
=====================================================
Script export data from DLE to CinemaPress
-----------------------------------------------------
https://cinemapress.io/
https://github.com/CinemaPress/CinemaPress
-----------------------------------------------------
Copyright (c) 2020 CinemaPress
=====================================================

View File

@ -78,11 +78,6 @@
for (i = 0; i < addId.length; i++)
addId[i].addEventListener('click', addIdList);
var addIp = document.querySelectorAll('a[data-add-ip-name]');
if (addIp)
for (i = 0; i < addIp.length; i++)
addIp[i].addEventListener('click', addIpList);
var delId = document.querySelectorAll('li[data-delete-name]');
if (delId)
for (i = 0; i < delId.length; i++)
@ -429,54 +424,6 @@
id.value = '';
}
function addIpList() {
var self = this;
var company_input = document.querySelector('input[data-add-ip="' + self.dataset.addIpName + '"]');
var company_name = company_input.value.trim().split(',');
company_input.value = '';
self.removeEventListener('click', addIpList);
self.innerHTML = '<span class="fa fa-spinner fa-spin"></span>';
if (company_name && company_name.length) {
var name = [];
company_name.forEach(function(cn) {
name.push('name[]=' + encodeURIComponent(cn));
});
var xhr = new XMLHttpRequest();
xhr.onreadystatechange = function() {
if (xhr.readyState === 4) {
if (xhr.status === 200 && xhr.responseText) {
var new_ips = JSON.parse(xhr.responseText);
var searchIps = document.querySelector('.search-ips');
new_ips.forEach(function(ni) {
var a = document.createElement('a');
a.setAttribute('href', 'https://whois.cinemapress.io/' + ni.split('/')[0] + '#' + company_name.join(','));
a.setAttribute('target', '_blank');
a.innerHTML = '&nbsp;' + ni + '&nbsp;';
searchIps.appendChild(a);
});
var addList = document.querySelector('textarea[name="' + self.dataset.addIpName + '"]');
var before_ips = addList.value.split(',').length;
var ips = arrayUnique(new_ips.concat(addList.value.split(',')));
var after_ips = ips.length - before_ips;
self.innerHTML = '<span class="fa fa-plus"></span>&nbsp;&nbsp;' + after_ips + '&nbsp;IPs';
addList.value = ips.join(',');
setTimeout(function() {
self.innerHTML = '<span class="fa fa-plus"></span>&nbsp;&nbsp;<%= __('Добавить все IP') %>';
self.addEventListener('click', addIpList);
}, 10000);
} else {
self.innerHTML = '<span class="fa fa-plus"></span>&nbsp;&nbsp;<%= __('Добавить все IP') %>';
self.addEventListener('click', addIpList);
}
}
}
xhr.open('GET', 'https://company.cinemapress.io/<%- config.domain %>?' + name.join('&'), true);
xhr.send(null);
}
}
function arrayUnique(array) {
var a = array.concat();
for(var i=0; i<a.length; ++i) {
@ -1378,7 +1325,7 @@
function alertCP() {
var xhr = new XMLHttpRequest();
xhr.open('POST', 'https://a.cinemapress.io', true);
xhr.open('GET', 'https://cinemapress.github.io/CinemaPress/files/alert.json', true);
xhr.onreadystatechange = function() {
if (xhr.readyState === 4 && xhr.status === 200) {
var alerts = JSON.parse(xhr.responseText);
@ -1393,7 +1340,7 @@
}
}
};
xhr.send();
xhr.send(null);
}
function inputData() {

View File

@ -525,25 +525,6 @@
<div class="inner-padding">
<div class="row">
<div class="col-lg-12 col-xs-12 text-center">
<div class="input-group">
<input class="form-control" type="text" placeholder="<%= __('Название организации для поиска всех её IP') %>" data-add-ip="modules.abuse.data.ips" autocomplete="off" autocapitalize="off" spellcheck="false">
<span class="input-group-btn">
<a href="javascript:void(0)" class="btn btn-default" data-add-ip-name="modules.abuse.data.ips">
<span class="fa fa-plus"></span>&nbsp;&nbsp;<%= __('Добавить все IP') %>
</a>
</span>
</div>
<div class="search-ips"></div>
<style>.search-ips {width: 100%; margin: 10px auto} .search-ips a {
margin: 1px;
padding: 0;
border: 1px #2f374b solid;
border-radius: 3px;
font-size: 9px;
display: inline-block;
}</style>
<textarea class="form-control" name="modules.abuse.data.ips" placeholder="<%= __('IP адреса для блокировки') %>"><% if (modules.abuse.data.ips) { %><%- modules.abuse.data.ips.join(',') %><% } %></textarea>
</div>