miteruzo/nizika
0
0
フォーク 0
コード 課題 5 Pull リクエスト リリース Wiki アクティビティ

コミットを比較

基準: miteruzo/nizika:cbb64ddcf110396385c8785faba68cae23c65284
ブランチ タグ
miteruzo/nizika:main miteruzo/nizika:bc-ajax miteruzo/nizika:NIZIKA_DEV-003 miteruzo/nizika:bc-detail
..
比較: miteruzo/nizika:bc-detail
ブランチ タグ
miteruzo/nizika:main miteruzo/nizika:bc-ajax miteruzo/nizika:NIZIKA_DEV-003 miteruzo/nizika:bc-detail

18 コミット
cbb64ddcf1 .. bc-detail

作成者 SHA1 メッセージ 日付
みてるぞ 3e97e3c4f4 [BC] available の hidden 要らん 2024-05-04 00:39:41 +09:00
みてるぞ b9c990d6b5 [BC] ニジカ落ちの警報表示 2024-05-04 00:24:46 +09:00
みてるぞ 506c29a32d [BC] 詳細画面 改行可能に 2024-05-03 16:35:14 +09:00
みてるぞ 535e44c4e7 ダブル・クヲゥトを escape 2024-05-02 06:43:16 +09:00
miteruzo ba39be8551 落ち確認 2024-05-02 06:33:51 +09:00
みてるぞ d50e23172b [BC] 詳細画面 とりま動くものにはなった 2024-04-25 04:07:32 +09:00
みてるぞ 0a1e46dd37 BC詳細画面 2024-04-24 04:51:42 +09:00
みてるぞ 2fba77b89f 'broadcast/index.frm.php' を更新 2024-04-23 04:08:00 +09:00
miteruzo b447c96d2e てすと 2024-04-23 04:07:18 +09:00
みてるぞ 4cae005dfe 'broadcast/index.frm.php' を更新 2024-04-23 03:59:35 +09:00
みてるぞ 101ca991a8 'broadcast/webhook.php' を更新 2024-04-23 03:58:46 +09:00
みてるぞ 82d366de79 'broadcast/index.frm.php' を更新 2024-04-23 03:57:34 +09:00
miteruzo 4c7a0dbe59 自動 Pull に対応（Jenkins 入れんでよかったやん……時間返せ） 2024-04-23 03:55:17 +09:00
みてるぞ 12af789385 ニジカのしっぽ手前に 2024-04-08 20:55:24 +09:00
みてるぞ b0823f7766 'broadcast/index.frm.php' を更新 2024-04-08 00:15:50 +09:00
みてるぞ 96a3ff125b キャッシュ・クリア 2024-04-08 00:12:53 +09:00
みてるぞ 46b231c6ac ちょっと修正 2024-04-08 00:03:07 +09:00
みてるぞ 2df0e1d9f5 ニジカ Pagination 完成 2024-04-07 23:54:34 +09:00
15個のファイルの変更，358行の追加，27行の削除
すべてのファイルを展開 すべてのファイルを折り畳む
broadcast/assets/bg.jpg
実行可能ファイル
バイナリ
ファイルの表示
バイナリファイルは表示されません．
並べて表示

変更後

幅:  |  高さ:  |  サイズ: 450 KiB

broadcast/assets/nikumaru.otf
バイナリ
ファイルの表示
バイナリファイルは表示されません．
broadcast/assets/nizika.png
バイナリ
ファイルの表示
バイナリファイルは表示されません．
並べて表示

変更後

幅:  |  高さ:  |  サイズ: 40 KiB

broadcast/assets/talking.png
バイナリ
ファイルの表示
バイナリファイルは表示されません．
並べて表示

変更後

幅:  |  高さ:  |  サイズ: 42 KiB

broadcast/common_module.js
+44
ファイルの表示
@@ -0,0 +1,44 @@
export default class
CommonModule
{
static
isWide (chr)
{
return chr.match (/[^\x01-\x7f]/) !== null;
}
static
lenByFull (str)
{
return str.split ('').map (c => this.isWide (c) ? 1 : .5)
.reduce ((a, c) => a + c);
}
static
indexByFToC (str, index)
{
let i = 0;
let work = '';
for (let c of str)
{
work += c;
if (this.lenByFull (work) > index)
break;
i += 1;
}
return i;
}
static
midByFull (str, start, length)
{
const trimmedLeft = str.slice (this.indexByFToC (str, start));
return trimmedLeft.slice (0, this.indexByFToC (trimmedLeft, length));
}
}
broadcast/index.frm.php
+26 -9
ファイルの表示
@@ -1,3 +1,5 @@
<!-- vim:set tabstop=4 softtabstop=4 expandtab :-->
<!DOCTYPE html> <!DOCTYPE html>
<html lang="ja"> <html lang="ja">
<head> <head>
@@ -9,7 +11,7 @@
<script src="//ajax.googleapis.com/ajax/libs/jqueryui/1/i18n/jquery.ui.datepicker-ja.min.js"></script> <script src="//ajax.googleapis.com/ajax/libs/jqueryui/1/i18n/jquery.ui.datepicker-ja.min.js"></script>
<link href="//cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-T3c6CoIi6uLrA9TneNEoa7RxnatzjcDSCmG1MXxSR1GAsXEV/Dwwykc2MPK8M2HN" crossorigin="anonymous" /> <link href="//cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-T3c6CoIi6uLrA9TneNEoa7RxnatzjcDSCmG1MXxSR1GAsXEV/Dwwykc2MPK8M2HN" crossorigin="anonymous" />
<link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/jqueryui/1.12.1/themes/base/jquery-ui.min.css" /> <link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/jqueryui/1.12.1/themes/base/jquery-ui.min.css" />
<link href="./style.css" rel="stylesheet" /> <link href="./style.css?<?= filemtime ('./style.css') ?>" rel="stylesheet" />
<?php $april_fool = ((int) date ('n') === 4) && ((int) date ('j') === 1) ?> <?php $april_fool = ((int) date ('n') === 4) && ((int) date ('j') === 1) ?>
<?php if ($april_fool): ?> <?php if ($april_fool): ?>
<link rel="icon" href="favicon-goatoh.ico" /> <link rel="icon" href="favicon-goatoh.ico" />
@@ -20,6 +22,12 @@
</head> </head>
<body> <body>
<?php if (!($available)): ?>
<div class="alert alert-danger" role="alert">
<strong>【警報】</strong>AIニジカが落ちてるぬ゛〜゛ん゛（泣）
</div>
<?php endif ?>
<div class="container my-5"> <div class="container my-5">
<div class="accordion mb-5" id="accordion-filter"> <div class="accordion mb-5" id="accordion-filter">
<div class="accordion-item"> <div class="accordion-item">
@@ -68,10 +76,16 @@
</div> </div>
<div class="col-sm input-group"> <div class="col-sm input-group">
<input type="text" class="form-control" placeholder="YYYY-MM-DD" id="filter-date-start" <input type="text"
class="form-control"
placeholder="YYYY-MM-DD"
id="filter-date-start"
value="<?= $date_start ?>" /> value="<?= $date_start ?>" />
<span class="input-group-text">〜</span> <span class="input-group-text">〜</span>
<input type="text" class="form-control" placeholder="YYYY-MM-DD" id="filter-date-end" <input type="text"
class="form-control"
placeholder="YYYY-MM-DD"
id="filter-date-end"
value="<?= $date_end ?>" /> value="<?= $date_end ?>" />
</div> </div>
</div> </div>
@@ -82,7 +96,10 @@
</div> </div>
<div class="col-sm"> <div class="col-sm">
<input type="text" class="form-control" placeholder="<?= $april_fool ? 'ﾑﾑﾑﾑ!! ｸｻﾀﾍﾞﾃﾙ!!!!!' : 'ぬ゛ぅ゛ぅ゛ぅ゛ぅ゛ぅ゛ん゛' ?>" id="filter-keyword" <input type="text"
class="form-control"
placeholder="<?= $april_fool ? 'ﾑﾑﾑﾑ!! ｸｻﾀﾍﾞﾃﾙ!!!!!' : 'ぬ゛ぅ゛ぅ゛ぅ゛ぅ゛ぅ゛ん゛' ?>"
id="filter-keyword"
value="<?= $keyword ?>"/> value="<?= $keyword ?>"/>
</div> </div>
</div> </div>
@@ -113,9 +130,9 @@
$length, $length,
true) true)
as $record): ?> as $record): ?>
<div class="mb-4"> <div class="mb-4 message-block">
<div> <div>
<?= $record['date_time'] ?> <span class="message-block-dt"><?= $record['date_time'] ?></span>
</div> </div>
<div> <div>
@@ -124,11 +141,11 @@
</div> </div>
<div style="color: blue"> <div style="color: blue">
&gt; <span style="font-style: italic"><?= $record['chat_message'] ?></span> &gt; <span class="message-block-chat" style="font-style: italic"><?= $record['chat_message'] ?></span>
</div> </div>
<div> <div>
<?= $record['answer'] ?> <span class="message-block-answer"><?= $record['answer'] ?></span>
</div> </div>
</div> </div>
<?php endforeach ?> <?php endforeach ?>
@@ -143,7 +160,7 @@
</div> </div>
<script src="//cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/js/bootstrap.bundle.min.js" integrity="sha384-C6RzsynM9kWDrMNeT87bh95OGNyZPhcTNXj1NW7RuBCsyN/o0jlpcV8Qyq46cDfL" crossorigin="anonymous"></script> <script src="//cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/js/bootstrap.bundle.min.js" integrity="sha384-C6RzsynM9kWDrMNeT87bh95OGNyZPhcTNXj1NW7RuBCsyN/o0jlpcV8Qyq46cDfL" crossorigin="anonymous"></script>
<script src="./script.js" type="text/javascript"></script> <script src="./script.js?<?= filemtime ('./script.js') ?>" type="text/javascript"></script>
</body> </body>
</html> </html>
broadcast/index.php
+5
ファイルの表示
@@ -7,6 +7,11 @@ const LOG_PATH = './log.txt';
$log_data = []; $log_data = [];
exec ("(ps -Af | grep -e '^miteruzo' | grep 'python3 main.py') && (ps -Af | grep -e '^miteruzo' | grep 'obs')",
$output, $exit_code);
$available = $exit_code === 0;
unset ($output, $exit_code);
$page = (int) ($_GET['p'] ?? 1); $page = (int) ($_GET['p'] ?? 1);
$length = (int) ($_GET['max'] ?? 20); $length = (int) ($_GET['max'] ?? 20);
$asc = ($_GET['asc'] ?? 0) != 0; $asc = ($_GET['asc'] ?? 0) != 0;
broadcast/pagination.cmp.php
+22 -9
ファイルの表示
@@ -1,15 +1,19 @@
<!-- vim:set tabstop=4 softtabstop=4 expandtab :-->
<nav class="d-flex justify-content-center" aria-label="..."> <nav class="d-flex justify-content-center" aria-label="...">
<ul class="pagination opacity-0"> <ul class="pagination opacity-0">
<?php if ($page > 1): ?> <?php if ($page > 1): ?>
<li class="page-item"> <li class="page-item deerjika-tail">
<a class="page-link" href="javascript: void (0)" onclick="Script.jumpTo (1)"> <a class="page-link" href="javascript: void (0)" onclick="Script.jumpTo (1)">
<img src="./assets/page-first.png" />|&lt; <img src="./assets/page-first.png" />
<div class="page-link-text">|&lt;</div>
</a> </a>
</li> </li>
<?php else: ?> <?php else: ?>
<li class="page-item disabled"> <li class="page-item disabled deerjika-tail">
<span class="page-link"> <span class="page-link">
<img src="./assets/page-first.png" />|&lt; <img src="./assets/page-first.png" />
<div class="page-link-text"></div>
</span> </span>
</li> </li>
<?php endif ?> <?php endif ?>
@@ -17,19 +21,24 @@
<?php for ($i = max (min ($page + 10, $pages_max) - 20, 1); $i < $page; ++$i): ?> <?php for ($i = max (min ($page + 10, $pages_max) - 20, 1); $i < $page; ++$i): ?>
<li class="page-item page-<?= $page - $i ?>"> <li class="page-item page-<?= $page - $i ?>">
<a class="page-link" href="javascript: void (0)" onclick="Script.jumpTo (<?= $i ?>)"> <a class="page-link" href="javascript: void (0)" onclick="Script.jumpTo (<?= $i ?>)">
<img src="./assets/page-body.png" /><?= $i ?> <img src="./assets/page-body.png" />
<div class="page-link-text"><?= $i ?></div>
</a> </a>
</li> </li>
<?php endfor ?> <?php endfor ?>
<li class="page-item active" aria-current="page"> <li class="page-item active" aria-current="page">
<span class="page-link"><img src="./assets/page-body.png" /><?= $page ?></span> <span class="page-link">
<img src="./assets/page-body.png" />
<div class="page-link-text"><?= $page ?></div>
</span>
</li> </li>
<?php for ($i = $page + 1; $i <= min (max ($page - 10, 1) + 20, $pages_max); ++$i): ?> <?php for ($i = $page + 1; $i <= min (max ($page - 10, 1) + 20, $pages_max); ++$i): ?>
<li class="page-item page-<?= $i - $page ?>"> <li class="page-item page-<?= $i - $page ?>">
<a class="page-link" href="javascript: void (0)" onclick="Script.jumpTo (<?= $i ?>)"> <a class="page-link" href="javascript: void (0)" onclick="Script.jumpTo (<?= $i ?>)">
<img src="./assets/page-body.png" /><?= $i ?> <img src="./assets/page-body.png" />
<div class="page-link-text"><?= $i ?></div>
</a> </a>
</li> </li>
<?php endfor ?> <?php endfor ?>
@@ -37,12 +46,16 @@
<?php if ($page < $pages_max): ?> <?php if ($page < $pages_max): ?>
<li class="page-item"> <li class="page-item">
<a class="page-link" href="javascript: void (0)" onclick="Script.jumpTo (<?= $pages_max ?>)"> <a class="page-link" href="javascript: void (0)" onclick="Script.jumpTo (<?= $pages_max ?>)">
<img src="./assets/page-last.png" />&gt;| <img src="./assets/page-last.png" />
<div class="page-link-text">&gt;|</div>
</a> </a>
</li> </li>
<?php else: ?> <?php else: ?>
<li class="page-item disabled"> <li class="page-item disabled">
<span class="page-link"><img src="./assets/page-last.png" />&gt;|</span> <span class="page-link">
<img src="./assets/page-last.png" />
<div class="page-link-text"></div>
</span>
</li> </li>
<?php endif ?> <?php endif ?>
</ul> </ul>
broadcast/script.js
+9
ファイルの表示
@@ -78,6 +78,15 @@ Script
$.cookie ('expand-filter', '0'); $.cookie ('expand-filter', '0');
}); });
$ ('.message-block').on ('click', function ()
{
const dt = $ (this).find ('.message-block-dt').text ();
const chat = $ (this).find ('.message-block-chat').text ();
const answer = $ (this).find ('.message-block-answer').text ();
window.open (`./talk.php?dt=${dt}&chat=${chat}&answer=${answer}`);
});
if ($.cookie ('expand-filter') === '0') if ($.cookie ('expand-filter') === '0')
{ {
$ ('#collapse-filter').removeClass ('show'); $ ('#collapse-filter').removeClass ('show');
broadcast/style.css
+47 -9
ファイルの表示
@@ -1,3 +1,5 @@
/* vim:set tabstop=2 softtabstop=2 expandtab :*/
.container-max-width .container-max-width
{ {
max-width: 1600px; max-width: 1600px;
@@ -18,20 +20,56 @@
max-width: 6px; max-width: 6px;
} }
.pagination
{
}
.page-item .page-item
{ {
width: 3.5em; width: 3.5em;
text-align: center; text-align: center;
vertical-align: middle; vertical-align: middle;
margin: 0;
padding: 0;
} }
.page-item:not(:not(.disabled, .active)) img .page-link
{ {
filter: invert(100%); color: black;
padding: 0;
margin: 0;
border: none;
margin-right: -3px;
}
.page-item.active > .page-link
{
font-weight: bold;
font-size: 150%;
}
.page-item.disabled > .page-link
{
color: lightgray;
}
.page-link-text
{
position: absolute;
top: 50%;
left: 50%;
transform: translate(-50%, -48%);
padding: 0;
margin: 0;
}
.pagination
{
--bs-pagination-bg: none;
--bs-pagination-disabled-bg: none;
--bs-pagination-hover-bg: none;
--bs-pagination-active-color: none;
--bs-pagination-active-bg: none;
}
.deerjika-tail
{
z-index: 1024;
} }
broadcast/talk.css
+32
ファイルの表示
@@ -0,0 +1,32 @@
/* vim:set tabstop=2 softtabstop=2 expandtab :*/
@font-face
{
font-family: 'Nikumaru';
src: url(./assets/nikumaru.otf);
}
html, body
{
overflow: hidden;
}
body
{
background-color: black;
}
#canvas
{
width: 100%;
height: 100%;
padding: 0;
margin: 0;
overflow: unset;
border: none
!important;
outline: none
!important;
display: block;
}
broadcast/talk.frm.php
+23
ファイルの表示
@@ -0,0 +1,23 @@
<!-- vim:set tabstop=4 softtabstop=4 expandtab :-->
<!DOCTYPE html>
<html lang="ja">
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<script src="//code.jquery.com/jquery-3.3.1.min.js"></script>
<link rel="stylesheet" href="./talk.css?<?= filemtime ('./talk.css') ?>" />
<link rel="preconnect" href="./assets/nikumaru.otf" />
<title>あほ</title>
<input type="hidden" id="dt" value="<?= $dt ?>" />
<input type="hidden" id="chat" value="<?= $chat ?>" />
<input type="hidden" id="answer" value="<?= $answer ?>" />
</head>
<body>
<canvas id="canvas"></canvas>
<script src="./talk.js?<?= filemtime ('./talk.js') ?>" type="module"></script>
</body>
</html>
broadcast/talk.js
+136
ファイルの表示
@@ -0,0 +1,136 @@
import CommonModule from './common_module.js';
class
Talk
{
static
main ()
{
const canvas = new Canvas;
window.onresize = () => canvas.resize ();
}
}
class
Canvas
{
constructor ()
{
this.canvas = $ ('#canvas');
this.ctx = this.canvas[0].getContext ('2d');
(this.bg = new Image ()).src = './assets/bg.jpg';
this.bg.onload = () => this.resize ();
(this.nizika = new Image ()).src = './assets/nizika.png';
this.nizika.onload = () => this.resize ();
(this.talking = new Image ()).src = './assets/talking.png';
this.talking.onload = () => this.resize ();
(new FontFace ('Nikumaru', 'url(./assets/nikumaru.otf)')).load ().then (
() => this.resize ());
}
resize ()
{
this.canvas[0].width = $ (window).width ();
this.canvas[0].height = $ (window).height ();
this.redraw ();
}
redraw ()
{
this.putBG ();
this.putText (0, 0, 15, $ ('#dt').val ());
this.putImage (this.nizika, 370, 260, 1.1);
this.putImage (this.talking, 0, 0, 640 / 1024);
this.putText (75, 43.75, 20,
('> ' + ((CommonModule.lenByFull ($ ('#chat').val ()) <= 21)
? $ ('#chat').val ()
: (CommonModule.midByFull ($ ('#chat').val (), 0, 19.5)
+ '...'))),
undefined, undefined,
true);
this.putText (62.5, 93.75, 31.25,
((CommonModule.lenByFull ($ ('#answer').val ()) <= 16)
? $ ('#answer').val ()
: CommonModule.midByFull ($ ('#answer').val (), 0, 16)),
'Nikumaru', '#c00000');
if (CommonModule.lenByFull ($ ('#answer').val ()) > 16)
{
this.putText (62.5, 125, 31.25,
((CommonModule.lenByFull ($ ('#answer').val ()) <= 32)
? CommonModule.midByFull ($ ('#answer').val (), 16, 16)
: (CommonModule.midByFull ($ ('#answer').val (), 16, 14.5)
+ '...')),
'Nikumaru', '#c00000');
}
}
putBG ()
{
const [x, y, zoom] = this.convertPosition (0, 0);
const width = this.bg.height * 4 / 3;
const height = this.bg.height;
this.ctx.drawImage (this.bg,
(852 - 640) / 2, 0, width, height,
x, y, width * zoom, height * zoom);
}
putImage (image, x, y, zoom = 1)
{
let zoom2
[x, y, zoom2] = this.convertPosition (x, y);
zoom *= zoom2
this.ctx.drawImage (image,
0, 0, image.width, image.height,
x, y, image.width * zoom, image.height * zoom);
}
putText (x, y, size, text, style = 'sans-serif', colour = 'black',
italic = false)
{
let zoom;
[x, y, zoom] = this.convertPosition (x, y);
size *= zoom;
this.ctx.font = `${italic ? 'italic ' : ''}${Math.trunc (size)}px ${style}`;
this.ctx.fillStyle = colour;
this.ctx.textBaseline = 'top';
this.ctx.fillText (text, x, y);
}
convertPosition (x, y)
{
const sizeX = this.canvas.width ();
const sizeY = this.canvas.height ();
const width = this.bg.height * 4 / 3;
const height = this.bg.height;
const vertical = sizeY / sizeX > height / width;
const zoom = vertical ? (sizeX / width) : (sizeY / height);
const baseX = vertical ? 0 : ((sizeX - width * zoom) / 2);
const baseY = vertical ? ((sizeY - height * zoom) / 2) : 0;
return [baseX + x * zoom, baseY + y * zoom, zoom];
}
}
$ (() => Talk.main ());
broadcast/talk.php
+11
ファイルの表示
@@ -0,0 +1,11 @@
<?php
if ($_SERVER['HTTP_HOST'] === 'nizika.monster')
header ('location: //nizika.tv/talk.php');
$dt = htmlspecialchars ($_GET['dt']);
$chat = htmlspecialchars ($_GET['chat']);
$answer = htmlspecialchars ($_GET['answer']);
require_once './talk.frm.php';
broadcast/webhook.php
+3
ファイルの表示
@@ -0,0 +1,3 @@
<?php
exec ('git pull');