Skip to content

Commit

Permalink
Updates Serey and Viz
Browse files Browse the repository at this point in the history
  • Loading branch information
denis-skripnik committed Jul 1, 2022
1 parent 48df3e6 commit 8b4caec
Show file tree
Hide file tree
Showing 41 changed files with 307 additions and 914 deletions.
6 changes: 3 additions & 3 deletions blockchains/serey/apps/accounts/js/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@ function saveAccount() {
let login = $('#login').val();
let posting_key = $('#posting_key').val();
let active_key = $('#active_key').val();
hive.api.getAccounts([login], function(err, res) {
steem.api.getAccounts([login], function(err, res) {
if (!err && res.length > 0) {
let acc = res[0];
let posting = '';
if (posting_key) {
const public_wif = hive.auth.wifToPublic(posting_key);
const public_wif = steem.auth.wifToPublic(posting_key);
let posting_public_keys = [];
for (key of acc.posting.key_auths) {
posting_public_keys.push(key[0]);
Expand All @@ -18,7 +18,7 @@ posting = sjcl.encrypt('dpos.space_serey_' + login + '_postingKey', posting_key)
}
let active = '';
if (active_key) {
const public_wif = hive.auth.wifToPublic(active_key);
const public_wif = steem.auth.wifToPublic(active_key);
let active_public_keys = [];
for (key of acc.active.key_auths) {
active_public_keys.push(key[0]);
Expand Down
6 changes: 6 additions & 0 deletions blockchains/serey/apps/activities/config.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"title": "Рейтинг активности за сутки",
"description": "Страница с рейтингом активности пользователей Serey за сутки",
"in_menu": "Активность",
"category": "reytings"
}
34 changes: 34 additions & 0 deletions blockchains/serey/apps/activities/content.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
<?php if (!defined('NOTLOAD')) exit('No direct script access allowed');
global $conf;
$html = file_get_contents('http://178.20.43.121:3179/serey-api?service=activity_stats');
$table = json_decode($html, true);
$content = '<link rel="stylesheet" type="text/css" href="//cdn.datatables.net/1.10.15/css/jquery.dataTables.min.css">
<script type="text/javascript" src="//cdn.datatables.net/1.10.15/js/jquery.dataTables.min.js"></script>
<p>Все данные удаляются в полночь по Москве. Иногда возможно будет пропускать, но чаще всего нет.</p>
<table id="table"><thead><tr><th>Логин</th><th>Постов и комментариев</th><th>Количество флагов</th><th>Количество апвоутов</th><th>Средний процент флага</th><th>Средний процент апа</th></tr></thead><tbody id="target">';
if ($table) {
foreach ($table as $user) {
if ($user['flags'] > 0) {
$average_flags_weight = $user['all_flags_weight'] / $user['flags'];
$average_flags_weight /= 100;
} else {
$average_flags_weight = 0;
}
if ($user['upvotes'] > 0) {
$average_upvotes_weight = $user['all_upvotes_weight'] / $user['upvotes'];
$average_upvotes_weight /= 100;
} else {
$average_upvotes_weight = 0;
}
$content .= '<tr align="right"><td align="left"><a href="'.$conf['siteUrl'].'serey/profiles/'.$user['login'].'" target="_blank">'.$user['login'].'</a></td>
<td>'.$user['content'].'</td>
<td>'.$user['flags'].'</td>
<td>'.$user['upvotes'].'</td>
<td>'.$average_flags_weight.'</td>
<td>'.$average_upvotes_weight.'</td></tr>';
}
}
$content .= '</tbody></table>
<script src="'.$conf['siteUrl'].'blockchains/serey/apps/activities/sort.js"></script>';
return $content;
?>
File renamed without changes.
22 changes: 22 additions & 0 deletions blockchains/serey/apps/activities/sort.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
$(document).ready(function() {
$('#table').DataTable( {
"language": {
"decimal": ",",
"thousands": ".",
"url": "//cdn.datatables.net/plug-ins/1.10.20/i18n/Russian.json"
},
"iDisplayLength": 50,
"order": [[ 1, "desc" ], [ 2, "desc" ], [ 3, "desc" ], [ 4, "desc" ], [ 5, "desc" ]],
"aoColumns": [
null,
{ "orderSequence": [ "desc" ] },
{ "orderSequence": [ "desc" ] },
{ "orderSequence": [ "desc" ] },
{ "orderSequence": [ "desc" ] },
{ "orderSequence": [ "desc" ] }
],
"aoColumnDefs": [
{ 'bSortable': false, 'aTargets': [ 0 ] }
],
} );
});
Binary file not shown.
12 changes: 7 additions & 5 deletions blockchains/serey/apps/backup/content.php
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
<?php if (!defined('NOTLOAD')) exit('No direct script access allowed');
$amount_account = 'denis-skripnik';
return '<h2>Список действий</h2>
<ol><li>Перейдите на страницу своего аккаунта в <a href="https://hive.blog" target="_blank">hive.blog</a>;</li>
$amount_account = 'blinddev';
return '
<!-- <h2>Список действий</h2>
<ol><li>Перейдите на страницу своего аккаунта в <a href="https://serey.io" target="_blank">serey.io</a>;</li>
<li>Отправьте 0.5 HBD или 1 SEREY на аккаунт @'.$amount_account.'. Заметка (memo):<br />
posts;<br></li>
<li>Введите логин в форме ниже</li>
Expand All @@ -12,7 +13,7 @@
<li><strong>Если вы оплатили услуги сервиса, но отображается по-прежнему сообщение о требующейся оплате, просьба пробовать несколько раз: возможно проблемы с публичной Нодой, к которой производится подключение. Если же сообщение очень долго, просьба написать в Telegram чат <a href="https://t.me/dpos_space" target="_blank">@dpos_space</a></strong></li></ol>
<form class="form" action="" method="post">
<input type="hidden" name="chain" value="hive">
<input type="hidden" name="chain" value="serey">
<input type="hidden" name="service" value="backup">
<p><label for="user">Имя пользователя (логин) на (Без "@"):</label>
<input type="text" name="user" value=""></p>
Expand All @@ -26,5 +27,6 @@
<option value="HTML">HTML (Скорее всего, понадобится только если у вас есть свой сайт, не поддерживающий MD, куда надо закинуть посты)</option>
</select></p>
<p align="center"><input type="submit" value="Запуск"></p>
</form>';
</form> -->
<p>Сервис не работает из-за отсутствия в ответе заголовков и текстов постов.</p>';
?>
13 changes: 6 additions & 7 deletions blockchains/serey/apps/backup/page/content.php
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?php if (!defined('NOTLOAD')) exit('No direct script access allowed');
$amount_account = 'denis-skripnik';
$amount_account = 'blinddev';
$content = '<h2>Список действий</h2>
<ol><li>Перейдите на страницу своего аккаунта в <a href="https://hive.blog" target="_blank">hive.blog</a>;</li>
<li>Отправьте 1 SEREY или 0.5 HBD на аккаунт @'.$amount_account.'. Заметка (memo):<br />
<ol><li>Перейдите на страницу своего аккаунта в <a href="https://serey.io" target="_blank">serey.io</a>;</li>
<li>Отправьте 1 SEREY на аккаунт @'.$amount_account.'. Заметка (memo):<br />
posts;<br></li>
<li>Введите логин в форме ниже</li>
<li>Выберите вариант получения репостов в списке материалов.</li></ol>
Expand Down Expand Up @@ -59,8 +59,7 @@
$mass = $res['result'];
foreach ($mass as $datas) {
$op = $datas[1]['op'];
$tokens3 = "0.500 HBD";
if ($op['0'] === 'transfer' && $op['1']['from'] === pageUrl()[2] && $op['1']['to'] === $amount_account && (($op['1']['amount'] ?? $op['1']['amount'] ?? "") === $tokens3 or ($op['1']['amount'] ?? $op['1']['amount'] ?? "") === "1.000 SEREY") && $op['1']['memo'] === "posts") {
if ($op['0'] === 'transfer' && $op['1']['from'] === pageUrl()[2] && $op['1']['to'] === $amount_account && (($op['1']['amount'] ?? $op['1']['amount'] ?? "") === "1.000 SEREY") && $op['1']['memo'] === "posts") {
if (isset($op) ){
$contentformat = pageUrl()[4];
if ($contentformat == 'Markdown') {
Expand All @@ -76,8 +75,8 @@
}

if (!isset($op_trx) ){
$content .= '<p>Пользователь <a href="https://hiveitwallet.com/@'.pageUrl()[2].'/" target="_blank">@'.pageUrl()[2].'</a> не произвёл платёж<br />
Перейдите в кошелёк, нажав на свой логин в строке выше.</p>';
$content .= '<p>Пользователь <a href="https://dpos.space/serey/wallet" target="_blank">@'.pageUrl()[2].'</a> не произвёл платёж<br />
Перейдите в кошелёк, нажав на свой логин в строке выше, и переведите 1 SEREY.</p>';
}

return $content;
Expand Down
13 changes: 1 addition & 12 deletions blockchains/serey/apps/calc/ajax.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@
$vote_weight = $_REQUEST['vote_weight'];
require __DIR__.'/snippets/get_dynamic_global_properties.php';
require __DIR__.'/snippets/get_chain_properties.php';
require __DIR__.'/snippets/get_feed_history.php';

require __DIR__.'/snippets/get_config.php';
require __DIR__.'/snippets/getRewardFund.php';

Expand All @@ -17,11 +15,6 @@
$chain_res = $chain_command->execute($chain_commandQuery);
$chain_mass = $chain_res['result'];

$feed_res = $feed_command->execute($feed_commandQuery);
$feed_mass = $feed_res['result'];



$RewardFund_res = $RewardFund_command->execute($RewardFund_commandQuery);
$RewardFund_mass = $RewardFund_res['result'];
$config_res = $config_command->execute($config_commandQuery);
Expand All @@ -45,12 +38,8 @@
$recent = (float)$RewardFund_mass['recent_claims'];

$hive_i = $rewa / $recent;
$base = (float)$feed_mass["current_median_history"]["base"];
$quote = (float)$feed_mass["current_median_history"]["quote"];
$median_price = round($base/$quote, 2);
$dasdas_golos = round($hive_r * $hive_m * 100 * $hive_i, 3)*($vote_weight/100);
$dasdas_gbg = round($hive_r * $hive_m * 100 * $hive_i * $median_price, 3)*($vote_weight/100);
echo "<p>Стоимость апвота: $dasdas_golos SEREY, $dasdas_gbg HBD</p>";
echo "<p>Стоимость апвота: $dasdas_golos SEREY</p>";
} else if ($type == 'result_SEREY') {
$sptec = $_REQUEST['sp-tec'];
require __DIR__.'/snippets/get_dynamic_global_properties.php';
Expand Down
8 changes: 4 additions & 4 deletions blockchains/serey/apps/manage/js/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ function date_str(timestamp,add_time,add_seconds,remove_today=false){

function proxyVote(field_name) {
let proxy_login = $('input[name=' + field_name + ']').val();
hive.broadcast.accountWitnessProxy(active_key, serey_login, proxy_login, function(err, result) {
steem.broadcast.accountWitnessProxy(active_key, serey_login, proxy_login, function(err, result) {
if (!err) {
if (field_name === 'proxy_login') {
window.alert('Прокси ' + proxy_login + ' успешно установлен.')
Expand All @@ -99,7 +99,7 @@ if (!err) {

function oneWitnessVote() {
let witness_login = $('input[name=witness_login]').val();
hive.broadcast.accountWitnessVote(active_key, serey_login, witness_login, true, function(err, result) {
steem.broadcast.accountWitnessVote(active_key, serey_login, witness_login, true, function(err, result) {
if (!err) {
window.alert('Вы успешно проголосовали за делегата ' + witness_login + '. Обновите страницу, чтоб увидеть, что он отмечен в списке.')
} else {
Expand All @@ -115,7 +115,7 @@ if (err.payload.error.message.indexOf('Vote currently exists, user must indicate
}

function witnessesVote() {
hive.api.getAccounts([serey_login], function(err, result) {
steem.api.getAccounts([serey_login], function(err, result) {
if (!err) {
if (result[0].proxy !== "") {
var q = window.confirm('Вы ранее установили прокси голосования за делегатов. Вы действительно хотите проголосовать за делегатов, отменив его?')
Expand Down Expand Up @@ -145,7 +145,7 @@ var operations = [];
operations.push(op);
}
}
hive.broadcast.send({extensions: [], operations}, [active_key], function(error, res) {
steem.broadcast.send({extensions: [], operations}, [active_key], function(error, res) {
if (!error) {
window.alert('Голоса успешно установлены.');
} else {
Expand Down
12 changes: 6 additions & 6 deletions blockchains/serey/apps/manage/pages/profile/footer.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
if(0<$('.profile-update').length){
hive.api.getAccounts([serey_login],function(err,response){
steem.api.getAccounts([serey_login],function(err,response){
if(!err){
let json_metadata=response[0].json_metadata;
let metadata;
Expand Down Expand Up @@ -72,7 +72,7 @@ console.log(err);
}

function profile_save(){
hive.api.getAccounts([serey_login],function(err,response){
steem.api.getAccounts([serey_login],function(err,response){
if(!err){
let json_metadata=response[0].json_metadata;
let metadata;
Expand All @@ -85,11 +85,11 @@ function profile_save(){
if (!metadata.profile) {
metadata.profile={};
}
metadata.profile.name=$('input[name=nickname]').val().trim();
metadata.profile.name= $('input[name=nickname]').val().trim();
metadata.profile.about=$('textarea[name=about]').html().trim();
metadata.profile.profile_image=$('input[name=avatar]').val().trim();
metadata.profile.cover_image =$('input[name=cover_image]').val().trim();
metadata.profile.gender=$('.profile-update select[name=gender]').val().trim();
metadata.profile.gender=$('.profile-update select[name=gender]').val();
metadata.profile.location=$('input[name=location]').val().trim();
var fullInterests = $('input[name=Interests]').val().trim();
var i = fullInterests.split(',');
Expand All @@ -101,7 +101,7 @@ metadata.profile.gender=$('.profile-update select[name=gender]').val().trim();
i2 = unique(i2);
metadata.profile.interests = i2;
metadata.profile.website=$('input[name=site]').val().trim();
metadata.profile.mail=$('input[name=mail]').val().trim().trim();
metadata.profile.mail=$('input[name=mail]').val().trim();
metadata.profile.facebook=$('input[name=facebook]').val().trim();
metadata.profile.instagram=$('input[name=instagram]').val().trim();
metadata.profile.twitter=$('input[name=twitter]').val().trim();
Expand All @@ -113,7 +113,7 @@ metadata.profile.gender=$('.profile-update select[name=gender]').val().trim();

json_metadata=JSON.stringify(metadata);
var memo = response[0].memo_key;
hive.broadcast.accountUpdate(active_key, serey_login, undefined, undefined, undefined, memo, json_metadata, function(err, result){
steem.broadcast.accountUpdate(active_key, serey_login, undefined, undefined, undefined, memo, json_metadata, function(err, result){
if(!err){
window.alert('Ок. Ваш профиль сохранён.');
}
Expand Down
2 changes: 1 addition & 1 deletion blockchains/serey/apps/manage/pages/witness/content.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<p><label for="witness_url">Url делегата (Страница с подробной информацией о делегате и его деятельности):
<input type="text" name="witness_url" value="" placeholder="Url делегата"></label></p>
<p><label for="witness_key">Публичный ключ делегата:
<input type="text" name="witness_key" value="" placeholder="STM..."></label></p>
<input type="text" name="witness_key" value="" placeholder="SRY..."></label></p>
<p><input type="button" id="witness_options" value="Сохранить"></p>
</form>
</div>
Expand Down
12 changes: 6 additions & 6 deletions blockchains/serey/apps/manage/pages/witness/footer.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ chf.hbd_interest_rate = "% начисляемый на HBD:";
chf.account_subsidy_budget = "Субсидии аккаунта, которые будут добавлены к субсидии аккаунта за блок. Это максимальная ставка, которую можно создать с помощью субсидий:";
chf.account_subsidy_decay = ":";

hive.api.getWitnessByAccount('dlike', function(err, res) {
steem.api.getWitnessByAccount('dlike', function(err, res) {
if (!err && !$.isEmptyObject(res)) {
let props = res.props;
$('input[name=witness_url]').val(res.url);
Expand Down Expand Up @@ -36,7 +36,7 @@ prop_value = parseFloat(props[prop]);
main();

$('#witness_options').click(function() {
hive.api.getWitnessByAccount(serey_login, function(error, res) {
steem.api.getWitnessByAccount(serey_login, function(error, res) {
if (!error && !$.isEmptyObject(res)) {
let props = {};
props.account_creation_fee = res.props.account_creation_fee;
Expand All @@ -45,11 +45,11 @@ props.hbd_interest_rate = res.props.hbd_interest_rate;
let url = $('input[name=witness_url]').val();
let blockSigningKey = $('input[name=witness_key]').val();
if (blockSigningKey === '') {
blockSigningKey = 'STM1111111111111111111111111111111114T1Anm';
blockSigningKey = 'SRY1111111111111111111111111111111114T1Anm';
}

let fee = "0.000 SEREY";
hive.broadcast.witnessUpdate(active_key, serey_login, url, blockSigningKey, props, fee, function(err, result) {
steem.broadcast.witnessUpdate(active_key, serey_login, url, blockSigningKey, props, fee, function(err, result) {
if (!err) {
window.alert('Настройки делегата сохранены.');
} else {
Expand All @@ -63,7 +63,7 @@ if (!err) {
});

$('#save_props').click(function() {
hive.api.getWitnessByAccount(serey_login, function(error, res) {
steem.api.getWitnessByAccount(serey_login, function(error, res) {
if (!error && !$.isEmptyObject(res)) {
let url = res.url;
let blockSigningKey = res.signing_key;
Expand Down Expand Up @@ -93,7 +93,7 @@ op[1].owner = serey_login;
op[1].props = [3, props];
operations.push(op);
console.log(JSON.stringify(operations));
hive.broadcast.send({extensions: [], operations}, [active_key], function(err, result) {
steem.broadcast.send({extensions: [], operations}, [active_key], function(err, result) {
if (!err) {
window.alert('Параметры сохранены успешно.');
} else {
Expand Down
8 changes: 4 additions & 4 deletions blockchains/serey/apps/manage/pages/witnesses/footer.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
function witnesses(from, witness_votes) {
hive.api.getWitnessesByVote(from, 100, function(err, res) {
steem.api.getWitnessesByVote(from, 100, function(err, res) {
if (!err && res.length > 1) {
var end_witness = '';
for (let i = 0; i <= res.length; i++) {
Expand All @@ -12,7 +12,7 @@ if (witness.signing_key === "SRY1111111111111111111111111111111114T1Anm") {
status = "активный";
}
let url_text = 'url';
if (witness.url.indexOf('hive.blog') > -1 || witness.url.indexOf('hive.blog') > -1) {
if (witness.url.indexOf('serey.io') > -1 || witness.url.indexOf('serey.io') > -1) {
url_text = 'пост';
} else {
url_text = 'сайт';
Expand All @@ -32,7 +32,7 @@ if (witness.signing_key === "SRY1111111111111111111111111111111114T1Anm") {
status = "активный";
}
let url_text = 'url';
if (witness.url.indexOf('hive.blog') > -1 || witness.url.indexOf('hive.blog') > -1) {
if (witness.url.indexOf('serey.io') > -1 || witness.url.indexOf('serey.io') > -1) {
url_text = 'пост';
} else {
url_text = 'сайт';
Expand All @@ -47,7 +47,7 @@ witnesses(end_witness)
}

function main() {
hive.api.getAccounts([serey_login], function(err, res) {
steem.api.getAccounts([serey_login], function(err, res) {
if (res[0].proxy !== '') {
$('#proxy').html('<p>Аккаунт <a href="https://dpos.space/serey/profiles/' + serey_login + '" target="_blank">' + serey_login + '</a> установил в качестве прокси <a href="https://dpos.space/serey/profiles/' + res[0].proxy + '" target="_blank">' + res[0].proxy + '</a></p>');
$('input[name=proxy_login]').val(res[0].proxy);
Expand Down
6 changes: 0 additions & 6 deletions blockchains/serey/apps/post/config.json

This file was deleted.

Loading

0 comments on commit 8b4caec

Please sign in to comment.