Merge branch 'develop'

app/Http/Controllers/UserController.php

@@ -39,7 +39,21 @@ SQL
             ->with('tags')
             ->paginate(20);
 
-        return view('user.profile')->with(compact('user', 'ejaculations'));
+        // よく使っているタグ
+        $tagsQuery = DB::table('ejaculations')
+            ->join('ejaculation_tag', 'ejaculations.id', '=', 'ejaculation_tag.ejaculation_id')
+            ->join('tags', 'ejaculation_tag.tag_id', '=', 'tags.id')
+            ->selectRaw('tags.name, count(*) as count')
+            ->where('ejaculations.user_id', $user->id);
+        if (!Auth::check() || $user->id !== Auth::id()) {
+            $tagsQuery = $tagsQuery->where('ejaculations.is_private', false);
+        }
+        $tags = $tagsQuery->groupBy('tags.name')
+            ->orderBy('count', 'desc')
+            ->limit(10)
+            ->get();
+
+        return view('user.profile')->with(compact('user', 'ejaculations', 'tags'));
     }
 
     public function stats($name)

app/MetadataResolver/MelonbooksResolver.php

@@ -0,0 +1,22 @@
+<?php
+
+namespace App\MetadataResolver;
+
+use GuzzleHttp\Cookie\CookieJar;
+
+class MelonbooksResolver implements Resolver
+{
+    public function resolve(string $url): Metadata
+    {
+        $cookieJar = CookieJar::fromArray(['AUTH_ADULT' => '1'], 'www.melonbooks.co.jp');
+
+        $client = new \GuzzleHttp\Client();
+        $res = $client->get($url, ['cookies' => $cookieJar]);
+        if ($res->getStatusCode() === 200) {
+            $ogpResolver = new OGPResolver();
+            return $ogpResolver->parse($res->getBody());
+        } else {
+            throw new \RuntimeException("{$res->getStatusCode()}: $url");
+        }
+    }
+}

app/MetadataResolver/MetadataResolver.php

@@ -8,6 +8,8 @@ class MetadataResolver implements Resolver
         '~(((sp\.)?seiga\.nicovideo\.jp/seiga(/#!)?|nico\.ms))/im~' => NicoSeigaResolver::class,
         '~nijie\.info/view\.php~' => NijieResolver::class,
         '~komiflo\.com(/#!)?/comics/(\\d+)~' => KomifloResolver::class,
+        '~www\.melonbooks\.co\.jp/detail/detail\.php~' => MelonbooksResolver::class,
+        '~ec\.toranoana\.jp/tora_r/ec/item/.*~' => ToranoanaResolver::class,
         '/.*/' => OGPResolver::class
     ];
 

app/MetadataResolver/OGPResolver.php

@@ -23,30 +23,24 @@ class OGPResolver implements Resolver
 
         $metadata = new Metadata();
 
-        $titleNode = $xpath->query('//meta[@*="og:title"]');
+        $metadata->title = $this->findContent($xpath, '//meta[@*="og:title"]', '//meta[@*="twitter:title"]');
-        foreach ($titleNode as $node) {
+        $metadata->description = $this->findContent($xpath, '//meta[@*="og:description"]', '//meta[@*="twitter:description"]');
-            if (!empty($node->getAttribute('content'))) {
+        $metadata->image = $this->findContent($xpath, '//meta[@*="og:image"]', '//meta[@*="twitter:image"]');
-                $metadata->title = $node->getAttribute('content');
-                break;
-            }
-        }
-
-        $descriptionNode = $xpath->query('//meta[@*="og:description"]');
-        foreach ($descriptionNode as $node) {
-            if (!empty($node->getAttribute('content'))) {
-                $metadata->description = $node->getAttribute('content');
-                break;
-            }
-        }
-
-        $imageNode = $xpath->query('//meta[@*="og:image"]');
-        foreach ($imageNode as $node) {
-            if (!empty($node->getAttribute('content'))) {
-                $metadata->image = $node->getAttribute('content');
-                break;
-            }
-        }
 
         return $metadata;
     }
+
+    private function findContent(\DOMXPath $xpath, string ...$expressions)
+    {
+        foreach ($expressions as $expression) {
+            $nodes = $xpath->query($expression);
+            foreach ($nodes as $node) {
+                $content = $node->getAttribute('content');
+                if (!empty($content)) {
+                    return $content;
+                }
+            }
+        }
+        return '';
+    }
 }

app/MetadataResolver/ToranoanaResolver.php

@@ -0,0 +1,22 @@
+<?php
+
+namespace App\MetadataResolver;
+
+use GuzzleHttp\Cookie\CookieJar;
+
+class ToranoanaResolver implements Resolver
+{
+    public function resolve(string $url): Metadata
+    {
+        $cookieJar = CookieJar::fromArray(['adflg' => '0'], 'ec.toranoana.jp');
+
+        $client = new \GuzzleHttp\Client();
+        $res = $client->get($url, ['cookies' => $cookieJar]);
+        if ($res->getStatusCode() === 200) {
+            $ogpResolver = new OGPResolver();
+            return $ogpResolver->parse($res->getBody());
+        } else {
+            throw new \RuntimeException("{$res->getStatusCode()}: $url");
+        }
+    }
+}

public/css/bootstrap-reboot.css

@@ -1,330 +0,0 @@
-html {
-  box-sizing: border-box;
-  font-family: sans-serif;
-  line-height: 1.15;
-  -webkit-text-size-adjust: 100%;
-  -ms-text-size-adjust: 100%;
-  -ms-overflow-style: scrollbar;
-  -webkit-tap-highlight-color: transparent;
-}
-
-*,
-*::before,
-*::after {
-  box-sizing: inherit;
-}
-
-@-ms-viewport {
-  width: device-width;
-}
-
-article, aside, dialog, figcaption, figure, footer, header, hgroup, main, nav, section {
-  display: block;
-}
-
-body {
-  margin: 0;
-  font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif;
-  font-size: 1rem;
-  font-weight: normal;
-  line-height: 1.5;
-  color: #212529;
-  background-color: #fff;
-}
-
-[tabindex="-1"]:focus {
-  outline: none !important;
-}
-
-hr {
-  box-sizing: content-box;
-  height: 0;
-  overflow: visible;
-}
-
-h1, h2, h3, h4, h5, h6 {
-  margin-top: 0;
-  margin-bottom: .5rem;
-}
-
-p {
-  margin-top: 0;
-  margin-bottom: 1rem;
-}
-
-abbr[title],
-abbr[data-original-title] {
-  text-decoration: underline;
-  -webkit-text-decoration: underline dotted;
-          text-decoration: underline dotted;
-  cursor: help;
-  border-bottom: 0;
-}
-
-address {
-  margin-bottom: 1rem;
-  font-style: normal;
-  line-height: inherit;
-}
-
-ol,
-ul,
-dl {
-  margin-top: 0;
-  margin-bottom: 1rem;
-}
-
-ol ol,
-ul ul,
-ol ul,
-ul ol {
-  margin-bottom: 0;
-}
-
-dt {
-  font-weight: bold;
-}
-
-dd {
-  margin-bottom: .5rem;
-  margin-left: 0;
-}
-
-blockquote {
-  margin: 0 0 1rem;
-}
-
-dfn {
-  font-style: italic;
-}
-
-b,
-strong {
-  font-weight: bolder;
-}
-
-small {
-  font-size: 80%;
-}
-
-sub,
-sup {
-  position: relative;
-  font-size: 75%;
-  line-height: 0;
-  vertical-align: baseline;
-}
-
-sub {
-  bottom: -.25em;
-}
-
-sup {
-  top: -.5em;
-}
-
-a {
-  color: #007bff;
-  text-decoration: none;
-  background-color: transparent;
-  -webkit-text-decoration-skip: objects;
-}
-
-a:hover {
-  color: #0056b3;
-  text-decoration: underline;
-}
-
-a:not([href]):not([tabindex]) {
-  color: inherit;
-  text-decoration: none;
-}
-
-a:not([href]):not([tabindex]):focus, a:not([href]):not([tabindex]):hover {
-  color: inherit;
-  text-decoration: none;
-}
-
-a:not([href]):not([tabindex]):focus {
-  outline: 0;
-}
-
-pre,
-code,
-kbd,
-samp {
-  font-family: monospace, monospace;
-  font-size: 1em;
-}
-
-pre {
-  margin-top: 0;
-  margin-bottom: 1rem;
-  overflow: auto;
-}
-
-figure {
-  margin: 0 0 1rem;
-}
-
-img {
-  vertical-align: middle;
-  border-style: none;
-}
-
-svg:not(:root) {
-  overflow: hidden;
-}
-
-a,
-area,
-button,
-[role="button"],
-input,
-label,
-select,
-summary,
-textarea {
-  -ms-touch-action: manipulation;
-      touch-action: manipulation;
-}
-
-table {
-  border-collapse: collapse;
-}
-
-caption {
-  padding-top: 0.75rem;
-  padding-bottom: 0.75rem;
-  color: #868e96;
-  text-align: left;
-  caption-side: bottom;
-}
-
-th {
-  text-align: left;
-}
-
-label {
-  display: inline-block;
-  margin-bottom: .5rem;
-}
-
-button:focus {
-  outline: 1px dotted;
-  outline: 5px auto -webkit-focus-ring-color;
-}
-
-input,
-button,
-select,
-optgroup,
-textarea {
-  margin: 0;
-  font-family: inherit;
-  font-size: inherit;
-  line-height: inherit;
-}
-
-button,
-input {
-  overflow: visible;
-}
-
-button,
-select {
-  text-transform: none;
-}
-
-button,
-html [type="button"],
-[type="reset"],
-[type="submit"] {
-  -webkit-appearance: button;
-}
-
-button::-moz-focus-inner,
-[type="button"]::-moz-focus-inner,
-[type="reset"]::-moz-focus-inner,
-[type="submit"]::-moz-focus-inner {
-  padding: 0;
-  border-style: none;
-}
-
-input[type="radio"],
-input[type="checkbox"] {
-  box-sizing: border-box;
-  padding: 0;
-}
-
-input[type="date"],
-input[type="time"],
-input[type="datetime-local"],
-input[type="month"] {
-  -webkit-appearance: listbox;
-}
-
-textarea {
-  overflow: auto;
-  resize: vertical;
-}
-
-fieldset {
-  min-width: 0;
-  padding: 0;
-  margin: 0;
-  border: 0;
-}
-
-legend {
-  display: block;
-  width: 100%;
-  max-width: 100%;
-  padding: 0;
-  margin-bottom: .5rem;
-  font-size: 1.5rem;
-  line-height: inherit;
-  color: inherit;
-  white-space: normal;
-}
-
-progress {
-  vertical-align: baseline;
-}
-
-[type="number"]::-webkit-inner-spin-button,
-[type="number"]::-webkit-outer-spin-button {
-  height: auto;
-}
-
-[type="search"] {
-  outline-offset: -2px;
-  -webkit-appearance: none;
-}
-
-[type="search"]::-webkit-search-cancel-button,
-[type="search"]::-webkit-search-decoration {
-  -webkit-appearance: none;
-}
-
-::-webkit-file-upload-button {
-  font: inherit;
-  -webkit-appearance: button;
-}
-
-output {
-  display: inline-block;
-}
-
-summary {
-  display: list-item;
-}
-
-template {
-  display: none;
-}
-
-[hidden] {
-  display: none !important;
-}
-/*# sourceMappingURL=bootstrap-reboot.css.map */

public/css/bootstrap-reboot.min.css

@@ -1,2 +1,8 @@
-html{box-sizing:border-box;font-family:sans-serif;line-height:1.15;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;-ms-overflow-style:scrollbar;-webkit-tap-highlight-color:transparent}*,::after,::before{box-sizing:inherit}@-ms-viewport{width:device-width}article,aside,dialog,figcaption,figure,footer,header,hgroup,main,nav,section{display:block}body{margin:0;font-family:-apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,"Helvetica Neue",Arial,sans-serif;font-size:1rem;font-weight:400;line-height:1.5;color:#212529;background-color:#fff}[tabindex="-1"]:focus{outline:0!important}hr{box-sizing:content-box;height:0;overflow:visible}h1,h2,h3,h4,h5,h6{margin-top:0;margin-bottom:.5rem}p{margin-top:0;margin-bottom:1rem}abbr[data-original-title],abbr[title]{text-decoration:underline;-webkit-text-decoration:underline dotted;text-decoration:underline dotted;cursor:help;border-bottom:0}address{margin-bottom:1rem;font-style:normal;line-height:inherit}dl,ol,ul{margin-top:0;margin-bottom:1rem}ol ol,ol ul,ul ol,ul ul{margin-bottom:0}dt{font-weight:700}dd{margin-bottom:.5rem;margin-left:0}blockquote{margin:0 0 1rem}dfn{font-style:italic}b,strong{font-weight:bolder}small{font-size:80%}sub,sup{position:relative;font-size:75%;line-height:0;vertical-align:baseline}sub{bottom:-.25em}sup{top:-.5em}a{color:#007bff;text-decoration:none;background-color:transparent;-webkit-text-decoration-skip:objects}a:hover{color:#0056b3;text-decoration:underline}a:not([href]):not([tabindex]){color:inherit;text-decoration:none}a:not([href]):not([tabindex]):focus,a:not([href]):not([tabindex]):hover{color:inherit;text-decoration:none}a:not([href]):not([tabindex]):focus{outline:0}code,kbd,pre,samp{font-family:monospace,monospace;font-size:1em}pre{margin-top:0;margin-bottom:1rem;overflow:auto}figure{margin:0 0 1rem}img{vertical-align:middle;border-style:none}svg:not(:root){overflow:hidden}[role=button],a,area,button,input,label,select,summary,textarea{-ms-touch-action:manipulation;touch-action:manipulation}table{border-collapse:collapse}caption{padding-top:.75rem;padding-bottom:.75rem;color:#868e96;text-align:left;caption-side:bottom}th{text-align:left}label{display:inline-block;margin-bottom:.5rem}button:focus{outline:1px dotted;outline:5px auto -webkit-focus-ring-color}button,input,optgroup,select,textarea{margin:0;font-family:inherit;font-size:inherit;line-height:inherit}button,input{overflow:visible}button,select{text-transform:none}[type=reset],[type=submit],button,html [type=button]{-webkit-appearance:button}[type=button]::-moz-focus-inner,[type=reset]::-moz-focus-inner,[type=submit]::-moz-focus-inner,button::-moz-focus-inner{padding:0;border-style:none}input[type=checkbox],input[type=radio]{box-sizing:border-box;padding:0}input[type=date],input[type=datetime-local],input[type=month],input[type=time]{-webkit-appearance:listbox}textarea{overflow:auto;resize:vertical}fieldset{min-width:0;padding:0;margin:0;border:0}legend{display:block;width:100%;max-width:100%;padding:0;margin-bottom:.5rem;font-size:1.5rem;line-height:inherit;color:inherit;white-space:normal}progress{vertical-align:baseline}[type=number]::-webkit-inner-spin-button,[type=number]::-webkit-outer-spin-button{height:auto}[type=search]{outline-offset:-2px;-webkit-appearance:none}[type=search]::-webkit-search-cancel-button,[type=search]::-webkit-search-decoration{-webkit-appearance:none}::-webkit-file-upload-button{font:inherit;-webkit-appearance:button}output{display:inline-block}summary{display:list-item}template{display:none}[hidden]{display:none!important}
+/*!
+ * Bootstrap Reboot v4.1.1 (https://getbootstrap.com/)
+ * Copyright 2011-2018 The Bootstrap Authors
+ * Copyright 2011-2018 Twitter, Inc.
+ * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
+ * Forked from Normalize.css, licensed MIT (https://github.com/necolas/normalize.css/blob/master/LICENSE.md)
+ */*,::after,::before{box-sizing:border-box}html{font-family:sans-serif;line-height:1.15;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;-ms-overflow-style:scrollbar;-webkit-tap-highlight-color:transparent}@-ms-viewport{width:device-width}article,aside,figcaption,figure,footer,header,hgroup,main,nav,section{display:block}body{margin:0;font-family:-apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,"Helvetica Neue",Arial,sans-serif,"Apple Color Emoji","Segoe UI Emoji","Segoe UI Symbol";font-size:1rem;font-weight:400;line-height:1.5;color:#212529;text-align:left;background-color:#fff}[tabindex="-1"]:focus{outline:0!important}hr{box-sizing:content-box;height:0;overflow:visible}h1,h2,h3,h4,h5,h6{margin-top:0;margin-bottom:.5rem}p{margin-top:0;margin-bottom:1rem}abbr[data-original-title],abbr[title]{text-decoration:underline;-webkit-text-decoration:underline dotted;text-decoration:underline dotted;cursor:help;border-bottom:0}address{margin-bottom:1rem;font-style:normal;line-height:inherit}dl,ol,ul{margin-top:0;margin-bottom:1rem}ol ol,ol ul,ul ol,ul ul{margin-bottom:0}dt{font-weight:700}dd{margin-bottom:.5rem;margin-left:0}blockquote{margin:0 0 1rem}dfn{font-style:italic}b,strong{font-weight:bolder}small{font-size:80%}sub,sup{position:relative;font-size:75%;line-height:0;vertical-align:baseline}sub{bottom:-.25em}sup{top:-.5em}a{color:#007bff;text-decoration:none;background-color:transparent;-webkit-text-decoration-skip:objects}a:hover{color:#0056b3;text-decoration:underline}a:not([href]):not([tabindex]){color:inherit;text-decoration:none}a:not([href]):not([tabindex]):focus,a:not([href]):not([tabindex]):hover{color:inherit;text-decoration:none}a:not([href]):not([tabindex]):focus{outline:0}code,kbd,pre,samp{font-family:SFMono-Regular,Menlo,Monaco,Consolas,"Liberation Mono","Courier New",monospace;font-size:1em}pre{margin-top:0;margin-bottom:1rem;overflow:auto;-ms-overflow-style:scrollbar}figure{margin:0 0 1rem}img{vertical-align:middle;border-style:none}svg:not(:root){overflow:hidden}table{border-collapse:collapse}caption{padding-top:.75rem;padding-bottom:.75rem;color:#6c757d;text-align:left;caption-side:bottom}th{text-align:inherit}label{display:inline-block;margin-bottom:.5rem}button{border-radius:0}button:focus{outline:1px dotted;outline:5px auto -webkit-focus-ring-color}button,input,optgroup,select,textarea{margin:0;font-family:inherit;font-size:inherit;line-height:inherit}button,input{overflow:visible}button,select{text-transform:none}[type=reset],[type=submit],button,html [type=button]{-webkit-appearance:button}[type=button]::-moz-focus-inner,[type=reset]::-moz-focus-inner,[type=submit]::-moz-focus-inner,button::-moz-focus-inner{padding:0;border-style:none}input[type=checkbox],input[type=radio]{box-sizing:border-box;padding:0}input[type=date],input[type=datetime-local],input[type=month],input[type=time]{-webkit-appearance:listbox}textarea{overflow:auto;resize:vertical}fieldset{min-width:0;padding:0;margin:0;border:0}legend{display:block;width:100%;max-width:100%;padding:0;margin-bottom:.5rem;font-size:1.5rem;line-height:inherit;color:inherit;white-space:normal}progress{vertical-align:baseline}[type=number]::-webkit-inner-spin-button,[type=number]::-webkit-outer-spin-button{height:auto}[type=search]{outline-offset:-2px;-webkit-appearance:none}[type=search]::-webkit-search-cancel-button,[type=search]::-webkit-search-decoration{-webkit-appearance:none}::-webkit-file-upload-button{font:inherit;-webkit-appearance:button}output{display:inline-block}summary{display:list-item;cursor:pointer}template{display:none}[hidden]{display:none!important}
 /*# sourceMappingURL=bootstrap-reboot.min.css.map */

resources/views/auth/login.blade.php

@@ -25,12 +25,9 @@
                         <div class="invalid-feedback">{{ $errors->first('password') }}</div>
                     @endif
                 </div>
-                <div class="form-check">
+                <div class="custom-control custom-checkbox mb-3">
-                    <label class="custom-control custom-checkbox">
+                    <input id="remember" name="remember" class="custom-control-input" type="checkbox" {{ old('remember') ? 'checked' : '' }}>
-                        <input id="remember" name="rememver" class="custom-control-input" type="checkbox" {{ old('remember') ? 'checked' : '' }}>
+                    <label class="custom-control-label" for="remember">保存する</label>
-                        <span class="custom-control-indicator"></span>
-                        <span class="custom-control-description">保存する</span>
-                    </label>
                 </div>
 
                 <button class="btn btn-primary" type="submit">ログイン</button>

resources/views/auth/register.blade.php

@@ -41,19 +41,13 @@
                     <h6 class="mb-3">プライバシーに関するオプション (全て任意です)</h6>
 
                     <div class="form-group">
-                        <div class="form-check">
+                        <div class="custom-control custom-checkbox mb-2">
-                            <label class="custom-control custom-checkbox">
                             <input id="protected" name="is_protected" class="custom-control-input" type="checkbox" {{ old('is_protected') ? 'checked' : '' }}>
-                                <span class="custom-control-indicator"></span>
+                            <label class="custom-control-label" for="protected">全てのチェックイン履歴を非公開にする</label>
-                                <span class="custom-control-description">全てのチェックイン履歴を非公開にする</span>
-                            </label>
                         </div>
-                        <div class="form-check">
+                        <div class="custom-control custom-checkbox">
-                            <label class="custom-control custom-checkbox">
                             <input id="accept-analytics" name="accept_analytics" class="custom-control-input" type="checkbox" {{ old('accept_analytics') ? 'checked' : '' }}>
-                                <span class="custom-control-indicator"></span>
+                            <label class="custom-control-label" for="accept-analytics">匿名での統計にチェックインデータを利用することに同意します</label>
-                                <span class="custom-control-description">匿名での統計にチェックインデータを利用することに同意します</span>
-                            </label>
                         </div>
                     </div>
                 </div>

resources/views/ejaculation/checkin.blade.php

@@ -78,13 +78,10 @@
                 <div class="form-row mt-4">
                     <p>オプション</p>
                     <div class="form-group col-sm-12">
-                        <div class="form-check">
+                        <div class="custom-control custom-checkbox mb-3">
-                            <label class="custom-control custom-checkbox">
+                            <input id="isPrivate" name="is_private" type="checkbox" class="custom-control-input" {{ old('is_private') || $defaults['is_private'] ? 'checked' : '' }}>
-                                <input name="is_private" type="checkbox" class="custom-control-input" {{ old('is_private') || $defaults['is_private'] ? 'checked' : '' }}>
+                            <label class="custom-control-label" for="isPrivate">
-                                <span class="custom-control-indicator"></span>
-                                <span class="custom-control-description">
                             <span class="oi oi-lock-locked"></span> このチェックインを非公開にする
-                            </span>
                             </label>
                         </div>
                     </div>

resources/views/ejaculation/edit.blade.php

@@ -52,17 +52,6 @@
                         @endif
                     </div>
                 </div>
-                {{--
-                <div class="form-row">
-                    <div class="form-group col-sm-12">
-                        <label for="tags"><span class="oi oi-tags"></span> タグ</label>
-                        <input id="tags" type="text" class="form-control" placeholder="未実装です" disabled>
-                        <small class="form-text text-muted">
-                            スペース区切りで複数入力できます。
-                        </small>
-                    </div>
-                </div>
-                --}}
                 <div class="form-row">
                     <div class="form-group col-sm-12">
                         <label for="link"><span class="oi oi-link-intact"></span> オカズリンク</label>
@@ -90,13 +79,10 @@
                 <div class="form-row mt-4">
                     <p>オプション</p>
                     <div class="form-group col-sm-12">
-                        <div class="form-check">
+                        <div class="custom-control custom-checkbox mb-3">
-                            <label class="custom-control custom-checkbox">
+                            <input id="isPrivate" name="is_private" type="checkbox" class="custom-control-input" {{ (is_bool(old('is_private')) ? old('is_private') : $ejaculation->is_private) ? 'checked' : '' }}>
-                                <input name="is_private" type="checkbox" class="custom-control-input" {{ (is_bool(old('is_private')) ? old('is_private') : $ejaculation->is_private) ? 'checked' : '' }}>
+                            <label class="custom-control-label" for="isPrivate">
-                                <span class="custom-control-indicator"></span>
-                                <span class="custom-control-description">
                             <span class="oi oi-lock-locked"></span> このチェックインを非公開にする
-                            </span>
                             </label>
                         </div>
                     </div>

resources/views/layouts/base.blade.php

@@ -50,7 +50,7 @@
                             <img src="{{ Auth::user()->getProfileImageUrl(30) }}" width="30" height="30" class="rounded d-inline-block align-top mr-2">
                             {{ Auth::user()->display_name }} さん
                         </a>
-                        <div class="dropdown-menu" aria-labelledby="navbarDropdownMenuLink">
+                        <div class="dropdown-menu dropdown-menu-right" aria-labelledby="navbarDropdownMenuLink">
                             {{--<a href="#" class="dropdown-item">設定</a>--}}
                             <a href="{{ route('logout') }}" class="dropdown-item" onclick="event.preventDefault(); document.getElementById('logout-form').submit();">ログアウト</a>
                         </div>

resources/views/user/base.blade.php

@@ -6,6 +6,8 @@
             <div class="col-lg-4">
                 @component('components.profile', ['user' => $user])
                 @endcomponent
+                @section('sidebar')
+                @show
             </div>
             <div class="col-lg-8">
                 <ul class="nav nav-tabs">

resources/views/user/profile.blade.php

@@ -1,5 +1,29 @@
 @extends('user.base')
 
+@section('sidebar')
+    {{-- TODO: タイムラインとオカズのテンプレを分けたら条件外す --}}
+    @if (Route::currentRouteName() === 'user.profile')
+    @if (!empty($tags) && (!$user->is_protected || $user->isMe()))
+        <div class="card mb-4">
+            <div class="card-header">
+                よく使っているタグ
+            </div>
+            <div class="list-group list-group-flush">
+                @foreach ($tags as $tag)
+                    <a class="list-group-item d-flex justify-content-between align-items-center">
+                        <div>
+                            <span class="oi oi-tag text-secondary"></span>
+                            {{ $tag->name }}
+                        </div>
+                        <span class="badge badge-secondary badge-pill">{{ $tag->count }}</span>
+                    </a>
+                @endforeach
+            </div>
+        </div>
+    @endif
+    @endif
+@endsection
+
 @section('tab-content')
 @if ($user->is_protected && !$user->isMe())
     <p class="mt-4">

tests/Unit/MetadataResolver/NijieResolverTest.php

@@ -38,7 +38,7 @@ class NijieResolverTest extends TestCase
 
         $metadata = $resolver->resolve('https://nijie.info/view.php?id=258078');
         $this->assertEquals('騎乗位ルーミア | しょったれ', $metadata->title);
-        $this->assertEquals("以前pixivに投稿したgifアニメ。\r\n気の利いたタイトルが浮かばなかった。", $metadata->description);
+        $this->assertEquals("最初は顔をZUN絵で描こうとか思っていたのだが、難しかったのでやめた", $metadata->description);
         $this->assertRegExp('~/nijie\.info/pic/logo~', $metadata->image);
     }
 
@@ -84,7 +84,7 @@ class NijieResolverTest extends TestCase
 
         $metadata = $resolver->resolve('https://sp.nijie.info/view.php?id=258078');
         $this->assertEquals('騎乗位ルーミア | しょったれ', $metadata->title);
-        $this->assertEquals("以前pixivに投稿したgifアニメ。\r\n気の利いたタイトルが浮かばなかった。", $metadata->description);
+        $this->assertEquals("最初は顔をZUN絵で描こうとか思っていたのだが、難しかったのでやめた", $metadata->description);
         $this->assertRegExp('~/nijie\.info/pic/logo~', $metadata->image);
     }