diff --git a/html/src/app.js b/html/src/app.js index 3691b765..9d07def0 100644 --- a/html/src/app.js +++ b/html/src/app.js @@ -1424,6 +1424,7 @@ speechSynthesis.getVoices(); $joinCount: 0, $timeSpent: 0, $lastSeen: '', + $nickName: '', // ...json }; @@ -5983,6 +5984,11 @@ speechSynthesis.getVoices(); var ref = this.friends.get(id); if (ref) { ref.memo = String(memo || ''); + ref.$nickName = ''; + if (memo) { + var array = memo.split('\n'); + ref.$nickName = array[0]; + } } }; @@ -6190,10 +6196,16 @@ speechSynthesis.getVoices(); ref, name: '', no: ++this.friendsNo, - memo: '' + memo: '', + $nickName: '' }; this.getMemo(id).then((memo) => { ctx.memo = memo; + ctx.$nickName = ''; + if (memo) { + var array = memo.split('\n'); + ctx.$nickName = array[0]; + } }); if (typeof ref === 'undefined') { ref = this.friendLog.get(id); @@ -10417,6 +10429,11 @@ speechSynthesis.getVoices(); var ref = this.friends.get(userId); if (ref) { ref.memo = String(memo || ''); + ref.$nickName = ''; + if (memo) { + var array = memo.split('\n'); + ref.$nickName = array[0]; + } } }); D.visible = true; diff --git a/html/src/index.pug b/html/src/index.pug index 8981f9b8..31bca309 100644 --- a/html/src/index.pug +++ b/html/src/index.pug @@ -1058,7 +1058,7 @@ html .avatar(:class="userStatusClass(friend.ref)") img(v-lazy="userImage(friend.ref)") .detail - span.name(v-if="friend.memo" :class="friend.ref.$trustColor") {{ friend.ref.displayName }} ({{ friend.memo }}) + span.name(v-if="friend.$nickName" :class="friend.ref.$trustColor") {{ friend.ref.displayName }} ({{ friend.$nickName }}) span.name(v-else v-text="friend.ref.displayName" :class="friend.ref.$trustColor") location.extra(:location="friend.ref.location" :link="false") template(v-else) @@ -1073,7 +1073,7 @@ html .avatar(:class="userStatusClass(friend.ref)") img(v-lazy="userImage(friend.ref)") .detail - span.name(v-if="friend.memo" :class="friend.ref.$trustColor") {{ friend.ref.displayName }} ({{ friend.memo }}) + span.name(v-if="friend.$nickName" :class="friend.ref.$trustColor") {{ friend.ref.displayName }} ({{ friend.$nickName }}) span.name(v-else v-text="friend.ref.displayName" :class="friend.ref.$trustColor") location.extra(:location="friend.ref.location" :link="false") template(v-else) @@ -1088,7 +1088,7 @@ html .avatar img(v-lazy="userImage(friend.ref)") .detail - span.name(v-if="friend.memo" :class="friend.ref.$trustColor") {{ friend.ref.displayName }} ({{ friend.memo }}) + span.name(v-if="friend.$nickName" :class="friend.ref.$trustColor") {{ friend.ref.displayName }} ({{ friend.$nickName }}) span.name(v-else v-text="friend.ref.displayName" :class="friend.ref.$trustColor") span.extra(v-text="friend.ref.statusDescription" :link="false") template(v-else) @@ -1103,7 +1103,7 @@ html .avatar img(v-lazy="userImage(friend.ref)") .detail - span.name(v-if="friend.memo" :class="friend.ref.$trustColor") {{ friend.ref.displayName }} ({{ friend.memo }}) + span.name(v-if="friend.$nickName" :class="friend.ref.$trustColor") {{ friend.ref.displayName }} ({{ friend.$nickName }}) span.name(v-else v-text="friend.ref.displayName" :class="friend.ref.$trustColor") span.extra(v-text="friend.ref.statusDescription") template(v-else)