From 06cc18565ee4b8b1e1d39e9571f91d034f6e0319 Mon Sep 17 00:00:00 2001 From: MitarashiDango Date: Sat, 7 Sep 2019 19:57:44 +0900 Subject: [PATCH 01/36] =?UTF-8?q?=E3=83=81=E3=82=A7=E3=83=83=E3=82=AF?= =?UTF-8?q?=E3=82=A4=E3=83=B3=E3=81=AB=E5=AF=BE=E3=81=97=E3=81=A6=E3=82=BB?= =?UTF-8?q?=E3=83=B3=E3=82=B7=E3=83=86=E3=82=A3=E3=83=96=E3=83=95=E3=83=A9?= =?UTF-8?q?=E3=82=B0=E3=82=92=E4=BB=98=E4=B8=8E=E5=8F=AF=E8=83=BD=E3=81=A8?= =?UTF-8?q?=E3=81=99=E3=82=8B=E5=AF=BE=E5=BF=9C=E3=82=92=E5=AE=9F=E6=96=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Ejaculation.php | 2 +- .../Controllers/EjaculationController.php | 9 ++++-- app/Http/Controllers/UserController.php | 2 ++ ...0_add_is_too_sensitive_to_ejaculations.php | 32 +++++++++++++++++++ resources/assets/js/app.js | 6 ++++ .../assets/sass/components/_link-card.scss | 21 ++++++++++++ .../views/components/ejaculation.blade.php | 2 +- .../views/components/link-card.blade.php | 7 +++- resources/views/ejaculation/checkin.blade.php | 6 ++++ resources/views/ejaculation/edit.blade.php | 6 ++++ resources/views/ejaculation/show.blade.php | 2 +- resources/views/user/profile.blade.php | 2 +- 12 files changed, 89 insertions(+), 8 deletions(-) create mode 100644 database/migrations/2019_09_07_164200_add_is_too_sensitive_to_ejaculations.php diff --git a/app/Ejaculation.php b/app/Ejaculation.php index 24f7e46..adeaff5 100644 --- a/app/Ejaculation.php +++ b/app/Ejaculation.php @@ -15,7 +15,7 @@ class Ejaculation extends Model protected $fillable = [ 'user_id', 'ejaculated_date', 'note', 'geo_latitude', 'geo_longitude', 'link', - 'is_private' + 'is_private', 'is_too_sensitive' ]; protected $dates = [ diff --git a/app/Http/Controllers/EjaculationController.php b/app/Http/Controllers/EjaculationController.php index 13ef8c4..cf11294 100644 --- a/app/Http/Controllers/EjaculationController.php +++ b/app/Http/Controllers/EjaculationController.php @@ -21,7 +21,8 @@ class EjaculationController extends Controller 'link' => $request->input('link', ''), 'tags' => $request->input('tags', ''), 'note' => $request->input('note', ''), - 'is_private' => $request->input('is_private', 0) == 1 + 'is_private' => $request->input('is_private', 0) == 1, + 'is_too_sensitive' => $request->input('is_too_sensitive', 0) == 1 ]; return view('ejaculation.checkin')->with('defaults', $defaults); @@ -56,7 +57,8 @@ class EjaculationController extends Controller 'ejaculated_date' => Carbon::createFromFormat('Y/m/d H:i', $inputs['date'] . ' ' . $inputs['time']), 'note' => $inputs['note'] ?? '', 'link' => $inputs['link'] ?? '', - 'is_private' => $request->has('is_private') ?? false + 'is_private' => $request->has('is_private') ?? false, + 'is_too_sensitive' => $request->has('is_too_sensitive') ?? false ]); $tagIds = []; @@ -137,7 +139,8 @@ class EjaculationController extends Controller 'ejaculated_date' => Carbon::createFromFormat('Y/m/d H:i', $inputs['date'] . ' ' . $inputs['time']), 'note' => $inputs['note'] ?? '', 'link' => $inputs['link'] ?? '', - 'is_private' => $request->has('is_private') ?? false + 'is_private' => $request->has('is_private') ?? false, + 'is_too_sensitive' => $request->has('is_too_sensitive') ?? false ])->save(); $tagIds = []; diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php index 86e8571..99c4b98 100644 --- a/app/Http/Controllers/UserController.php +++ b/app/Http/Controllers/UserController.php @@ -30,6 +30,7 @@ id, ejaculated_date, note, is_private, +is_too_sensitive, link, to_char(lead(ejaculated_date, 1, NULL) OVER (ORDER BY ejaculated_date DESC), 'YYYY/MM/DD HH24:MI') AS before_date, to_char(ejaculated_date - (lead(ejaculated_date, 1, NULL) OVER (ORDER BY ejaculated_date DESC)), 'FMDDD日 FMHH24時間 FMMI分') AS ejaculated_span @@ -151,6 +152,7 @@ id, ejaculated_date, note, is_private, +is_too_sensitive, link, to_char(lead(ejaculated_date, 1, NULL) OVER (ORDER BY ejaculated_date DESC), 'YYYY/MM/DD HH24:MI') AS before_date, to_char(ejaculated_date - (lead(ejaculated_date, 1, NULL) OVER (ORDER BY ejaculated_date DESC)), 'FMDDD日 FMHH24時間 FMMI分') AS ejaculated_span diff --git a/database/migrations/2019_09_07_164200_add_is_too_sensitive_to_ejaculations.php b/database/migrations/2019_09_07_164200_add_is_too_sensitive_to_ejaculations.php new file mode 100644 index 0000000..d897a39 --- /dev/null +++ b/database/migrations/2019_09_07_164200_add_is_too_sensitive_to_ejaculations.php @@ -0,0 +1,32 @@ +boolean('is_too_sensitive')->default(false); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::table('ejaculations', function (Blueprint $table) { + $table->dropColumn('is_too_sensitive'); + }); + } +} diff --git a/resources/assets/js/app.js b/resources/assets/js/app.js index bf79d54..629d2dc 100644 --- a/resources/assets/js/app.js +++ b/resources/assets/js/app.js @@ -92,4 +92,10 @@ $(() => { }); } }); + + $(document).on('click', '.card-spoiler-overlay', function (event) { + const $this = $(this); + $this.siblings(".card-link").removeClass("card-spoiler"); + $this.remove(); + }); }); \ No newline at end of file diff --git a/resources/assets/sass/components/_link-card.scss b/resources/assets/sass/components/_link-card.scss index a154454..4e5d660 100644 --- a/resources/assets/sass/components/_link-card.scss +++ b/resources/assets/sass/components/_link-card.scss @@ -30,4 +30,25 @@ .card-text { white-space: pre-line; } + + .card-spoiler-overlay { + position: absolute; + z-index: 1000; + display: flex; + align-items: center; + justify-content: center; + width: 100%; + height: 100%; + + .warning-text { + padding: 10px; + background-color: rgba(240, 240, 240, 0.8); + border-radius: 5px; + } + } + + .card-spoiler { + z-index: 1; + filter: blur(15px) grayscale(100%); + } } diff --git a/resources/views/components/ejaculation.blade.php b/resources/views/components/ejaculation.blade.php index cda134b..c0650d9 100644 --- a/resources/views/components/ejaculation.blade.php +++ b/resources/views/components/ejaculation.blade.php @@ -19,7 +19,7 @@ @if (!empty($ejaculation->link))
- @component('components.link-card', ['link' => $ejaculation->link]) + @component('components.link-card', ['link' => $ejaculation->link, 'is_too_sensitive' => $ejaculation->is_too_sensitive]) @endcomponent

{{ $ejaculation->link }} diff --git a/resources/views/components/link-card.blade.php b/resources/views/components/link-card.blade.php index f0d7de3..57eda2d 100644 --- a/resources/views/components/link-card.blade.php +++ b/resources/views/components/link-card.blade.php @@ -1,5 +1,10 @@

- + @if ($is_too_sensitive) +
+ クリックまたはタップで表示 +
+ @endif +
Thumbnail diff --git a/resources/views/ejaculation/checkin.blade.php b/resources/views/ejaculation/checkin.blade.php index e238440..42c22bd 100644 --- a/resources/views/ejaculation/checkin.blade.php +++ b/resources/views/ejaculation/checkin.blade.php @@ -85,6 +85,12 @@ このチェックインを非公開にする
+
+ + +
diff --git a/resources/views/ejaculation/edit.blade.php b/resources/views/ejaculation/edit.blade.php index 2e5984e..dd9cdd8 100644 --- a/resources/views/ejaculation/edit.blade.php +++ b/resources/views/ejaculation/edit.blade.php @@ -86,6 +86,12 @@ このチェックインを非公開にする
+
+ is_too_sensitive) ? 'checked' : '' }}> + +
diff --git a/resources/views/ejaculation/show.blade.php b/resources/views/ejaculation/show.blade.php index e5dc595..2f24075 100644 --- a/resources/views/ejaculation/show.blade.php +++ b/resources/views/ejaculation/show.blade.php @@ -47,7 +47,7 @@ @if (!empty($ejaculation->link))
- @component('components.link-card', ['link' => $ejaculation->link]) + @component('components.link-card', ['link' => $ejaculation->link, 'is_too_sensitive' => $ejaculation->is_too_sensitive]) @endcomponent

{{ $ejaculation->link }} diff --git a/resources/views/user/profile.blade.php b/resources/views/user/profile.blade.php index 7276548..2c36e3d 100644 --- a/resources/views/user/profile.blade.php +++ b/resources/views/user/profile.blade.php @@ -53,7 +53,7 @@ @if (!empty($ejaculation->link))

- @component('components.link-card', ['link' => $ejaculation->link]) + @component('components.link-card', ['link' => $ejaculation->link, 'is_too_sensitive' => $ejaculation->is_too_sensitive]) @endcomponent

{{ $ejaculation->link }} From 524d00d0edff8625f1a00308212ad831c6bfcae2 Mon Sep 17 00:00:00 2001 From: MitarashiDango Date: Sat, 7 Sep 2019 21:06:06 +0900 Subject: [PATCH 02/36] =?UTF-8?q?=E3=82=AA=E3=83=BC=E3=83=90=E3=83=BC?= =?UTF-8?q?=E3=83=AC=E3=82=A4=E3=81=AE=E3=82=B9=E3=82=BF=E3=82=A4=E3=83=AB?= =?UTF-8?q?=E3=82=92=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- resources/assets/sass/components/_link-card.scss | 2 ++ 1 file changed, 2 insertions(+) diff --git a/resources/assets/sass/components/_link-card.scss b/resources/assets/sass/components/_link-card.scss index 4e5d660..2115e84 100644 --- a/resources/assets/sass/components/_link-card.scss +++ b/resources/assets/sass/components/_link-card.scss @@ -39,11 +39,13 @@ justify-content: center; width: 100%; height: 100%; + cursor: pointer; .warning-text { padding: 10px; background-color: rgba(240, 240, 240, 0.8); border-radius: 5px; + user-select: none; } } From a7972046ef8093a9755b03adee926e87a3228de4 Mon Sep 17 00:00:00 2001 From: MitarashiDango Date: Sat, 7 Sep 2019 21:19:31 +0900 Subject: [PATCH 03/36] fix stylelint error --- resources/assets/sass/components/_link-card.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/assets/sass/components/_link-card.scss b/resources/assets/sass/components/_link-card.scss index 2115e84..f5f7268 100644 --- a/resources/assets/sass/components/_link-card.scss +++ b/resources/assets/sass/components/_link-card.scss @@ -43,9 +43,9 @@ .warning-text { padding: 10px; + user-select: none; background-color: rgba(240, 240, 240, 0.8); border-radius: 5px; - user-select: none; } } From 2b98267fa852759d27e7b91e229de2ffeffe8be9 Mon Sep 17 00:00:00 2001 From: MitarashiDango Date: Sun, 8 Sep 2019 02:39:18 +0900 Subject: [PATCH 04/36] =?UTF-8?q?=E8=A8=AD=E5=AE=9A=E9=A0=85=E7=9B=AE?= =?UTF-8?q?=E3=81=AE=E3=82=A2=E3=82=A4=E3=82=B3=E3=83=B3=E5=A4=89=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- resources/views/ejaculation/checkin.blade.php | 2 +- resources/views/ejaculation/edit.blade.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/views/ejaculation/checkin.blade.php b/resources/views/ejaculation/checkin.blade.php index 42c22bd..e528674 100644 --- a/resources/views/ejaculation/checkin.blade.php +++ b/resources/views/ejaculation/checkin.blade.php @@ -88,7 +88,7 @@

diff --git a/resources/views/ejaculation/edit.blade.php b/resources/views/ejaculation/edit.blade.php index dd9cdd8..ffdbd45 100644 --- a/resources/views/ejaculation/edit.blade.php +++ b/resources/views/ejaculation/edit.blade.php @@ -89,7 +89,7 @@
is_too_sensitive) ? 'checked' : '' }}>
From 22150d0e7ad280c9c0d34a7792e0196ccceee29d Mon Sep 17 00:00:00 2001 From: shibafu Date: Sun, 8 Sep 2019 16:32:37 +0900 Subject: [PATCH 05/36] =?UTF-8?q?=E5=90=8C=E3=81=98=E3=82=AA=E3=82=AB?= =?UTF-8?q?=E3=82=BA=E3=81=A7=E3=83=81=E3=82=A7=E3=83=83=E3=82=AF=E3=82=A4?= =?UTF-8?q?=E3=83=B3=E3=81=99=E3=82=8B=E9=9A=9B=E3=81=AB=E3=82=BB=E3=83=B3?= =?UTF-8?q?=E3=82=B7=E3=83=86=E3=82=A3=E3=83=96=E3=83=95=E3=83=A9=E3=82=B0?= =?UTF-8?q?=E3=82=92=E7=B6=99=E6=89=BF=E3=81=99=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Ejaculation.php | 13 +++++++++++++ resources/views/components/ejaculation.blade.php | 4 ++-- resources/views/ejaculation/show.blade.php | 2 +- resources/views/user/profile.blade.php | 2 +- 4 files changed, 17 insertions(+), 4 deletions(-) diff --git a/app/Ejaculation.php b/app/Ejaculation.php index adeaff5..5c670f6 100644 --- a/app/Ejaculation.php +++ b/app/Ejaculation.php @@ -79,4 +79,17 @@ class Ejaculation extends Model ->addSelect(DB::raw('0 as is_liked')); } } + + /** + * このチェックインと同じ情報を流用してチェックインするためのURLを生成 + * @return string + */ + public function makeCheckinURL(): string + { + return route('checkin', [ + 'link' => $this->link, + 'tags' => $this->textTags(), + 'is_too_sensitive' => $this->is_too_sensitive, + ]); + } } diff --git a/resources/views/components/ejaculation.blade.php b/resources/views/components/ejaculation.blade.php index c0650d9..9635273 100644 --- a/resources/views/components/ejaculation.blade.php +++ b/resources/views/components/ejaculation.blade.php @@ -49,8 +49,8 @@
+ title="同じオカズでチェックイン" data-href="{{ $ejaculation->makeCheckinURL() }}"> -
\ No newline at end of file + diff --git a/resources/views/ejaculation/show.blade.php b/resources/views/ejaculation/show.blade.php index 2f24075..8d870e0 100644 --- a/resources/views/ejaculation/show.blade.php +++ b/resources/views/ejaculation/show.blade.php @@ -75,7 +75,7 @@ @endif
- + @if ($user->isMe()) diff --git a/resources/views/user/profile.blade.php b/resources/views/user/profile.blade.php index 2c36e3d..056a53e 100644 --- a/resources/views/user/profile.blade.php +++ b/resources/views/user/profile.blade.php @@ -81,7 +81,7 @@ @endif
- + @if ($user->isMe()) From b367009c5c9c7f6ed29a0126b5916e38446b976d Mon Sep 17 00:00:00 2001 From: eai04191 Date: Mon, 9 Sep 2019 09:35:38 +0900 Subject: [PATCH 06/36] Update DLsite Fixture --- tests/fixture/DLsite/testBL.html | 1001 +++++++++----- tests/fixture/DLsite/testBooks.html | 792 +++++++---- tests/fixture/DLsite/testComic.html | 730 ++++++---- tests/fixture/DLsite/testEcchiEng.html | 403 +++--- tests/fixture/DLsite/testEng.html | 344 ++--- tests/fixture/DLsite/testGirls.html | 1008 +++++++++----- tests/fixture/DLsite/testGirlsPro.html | 777 +++++++---- tests/fixture/DLsite/testHTMLdescription.html | 416 +++--- tests/fixture/DLsite/testHome.html | 1097 +++++++++------ tests/fixture/DLsite/testManiax.html | 1069 +++++++++------ tests/fixture/DLsite/testPro.html | 1206 ++++++++++------- tests/fixture/DLsite/testSoft.html | 944 ++++++++----- 12 files changed, 5927 insertions(+), 3860 deletions(-) diff --git a/tests/fixture/DLsite/testBL.html b/tests/fixture/DLsite/testBL.html index 68a35e7..4fa78bf 100644 --- a/tests/fixture/DLsite/testBL.html +++ b/tests/fixture/DLsite/testBL.html @@ -1,8 +1,8 @@ - + - + @@ -43,20 +43,20 @@ - + - - - - + + + + - + - + - + @@ -94,7 +94,7 @@ $.extend({ if ($.useAdultcheck) return; $.useAdultcheck = true; var s = document.createElement('script'); - s.src = '/js/adultcheck.js?1553837147'; + s.src = '/js/adultcheck.js?1566881566'; s.defer = true; document.querySelector('head').appendChild(s); } @@ -121,19 +121,22 @@ if ((dlsite.isAdult() && dlsite.getId() !== 'circle' && !(dlsite.isFemale() && d 女性向け
  • - オンラインゲーム + にじよめ
  • - クリエイター支援 + Ci-en
  • - コミュニティ + DLチャンネル
  • - 無料体験版 + chobit
    • -
  • - 即売会取り置き +
  • + トリオキニ +
    • +
  • + DLsiteスタジオ
      • @@ -146,11 +149,10 @@ if ((dlsite.isAdult() && dlsite.getId() !== 'circle' && !(dlsite.isFemale() && d
      - {{ login_id.substr(0, 30) }}{{ login_id.length > 30 ? '...' : '' }}でログイン中 -
      + {{ login_id.substr(0, 30) }}{{ login_id.length > 30 ? '...' : '' }}でログイン中
      • - アカウント管理 + アカウント管理
      • ログアウト @@ -162,12 +164,18 @@ if ((dlsite.isAdult() && dlsite.getId() !== 'circle' && !(dlsite.isFemale() && d
        -

        ログイン中のアカウントが変更されました

        +

        {{ login_id.substr(0, 30) }}{{ login_id.length > 30 ? '...' : '' }}でログインしています

        +

        ログアウトしました

      + +
      +
      Language
      +
      +
    @@ -204,10 +212,10 @@ if ((dlsite.isAdult() && dlsite.getId() !== 'circle' && !(dlsite.isFemale() && d
    - - +
    @@ -254,21 +262,33 @@ if ((dlsite.isAdult() && dlsite.getId() !== 'circle' && !(dlsite.isFemale() && d お気に入り
  • カート
    • -
  • 購入済作品
    • -
  • マイページ
    • -
  • サークル管理
    • +
  • 購入済作品
    • +
  • + アカウント +
    +
    + +
    +
    +
    • -
    ガイド -
    - +
    + ガイド +
    +
    + +
    @@ -277,14 +297,8 @@ if ((dlsite.isAdult() && dlsite.getId() !== 'circle' && !(dlsite.isFemale() && d
    @@ -313,6 +327,25 @@ if ((dlsite.isAdult() && dlsite.getId() !== 'circle' && !(dlsite.isFemale() && d
    +
    +
    + +
    +
    +
    @@ -340,7 +373,21 @@ if (loginchecked & 1) {
    -
    +
    + +
      @@ -397,7 +444,7 @@ if (loginchecked & 1) {

      - +
    @@ -418,24 +465,23 @@ if (loginchecked & 1) {
    -
    - - - - - - + + + + + + +
    - - - - - - - - -
         
    -    		 - +
    + + + + + - - - -
    + + + + + + + + +
         
    +     		+
    ({{ product.rate_count }})
    @@ -508,19 +554,29 @@ if (loginchecked & 1) {
    -
    ({{ product.review_count }})
    DL : {{ product.dl_count }}
    +
    		+
    +     		+
    +
    +     		+
    +
    - +
    - +
    @@ -574,9 +630,10 @@ if (loginchecked & 1) {
    - HTML版で表示 + HTML版で表示 - {{ __('totalImages', {count: items.length}) }} + +
    @@ -586,7 +643,7 @@ if (loginchecked & 1) {