etc/Sharkey
0
0
Fork 0
mirror of https://activitypub.software/TransFem-org/Sharkey synced 2024-11-26 16:03:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix #1960

Browse source
This commit is contained in:
syuilo 2018-07-25 00:51:30 +09:00
parent 7d99b154c0
commit f1bbbcfedf
2 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/client/app/common/views/directives/autocomplete.ts
View file

@ -1,5 +1,6 @@
import * as getCaretCoordinates from 'textarea-caret'; import * as getCaretCoordinates from 'textarea-caret';
import MkAutocomplete from '../components/autocomplete.vue'; import MkAutocomplete from '../components/autocomplete.vue';
import renderAcct from '../../../../../misc/acct/render';
export default { export default {
bind(el, binding, vn) { bind(el, binding, vn) {
@ -187,13 +188,15 @@ class Autocomplete {
const trimmedBefore = before.substring(0, before.lastIndexOf('@')); const trimmedBefore = before.substring(0, before.lastIndexOf('@'));
const after = source.substr(caret); const after = source.substr(caret);
const acct = renderAcct(value);
// 挿入 // 挿入
this.text = trimmedBefore + '@' + value.username + ' ' + after; this.text = trimmedBefore + '@' + acct + ' ' + after;
// キャレットを戻す // キャレットを戻す
this.vm.$nextTick(() => { this.vm.$nextTick(() => {
this.textarea.focus(); this.textarea.focus();
const pos = trimmedBefore.length + (value.username.length + 2); const pos = trimmedBefore.length + (acct.length + 2);
this.textarea.setSelectionRange(pos, pos); this.textarea.setSelectionRange(pos, pos);
}); });
} else if (type == 'hashtag') { } else if (type == 'hashtag') {

7
src/misc/acct/render.ts
View file

@ -1,5 +1,8 @@
import { IUser } from '../../models/user'; type UserLike = {
host: string;
username: string;
};
export default (user: IUser) => { export default (user: UserLike) => {
return user.host === null ? user.username : `${user.username}@${user.host}`; return user.host === null ? user.username : `${user.username}@${user.host}`;
}; };