heartles/egirlskey
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity

Better mention handling

Browse source
This commit is contained in:
syuilo 2018-05-26 23:20:52 +09:00
parent 5e4a0fd4ec
commit 67b3461c24
2 changed files with 24 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/client/app/desktop/views/components/post-form.vue
View file

@ -49,6 +49,7 @@ import Vue from 'vue';
import * as XDraggable from 'vuedraggable';
import getKao from '../../../common/scripts/get-kao';
import MkVisibilityChooser from '../../../common/views/components/visibility-chooser.vue';
import parse from '../../../../../text/parse';
export default Vue.extend({
components: {
@ -110,6 +111,17 @@ export default Vue.extend({
this.text = `@${this.reply.user.username}@${this.reply.user.host} `;
}
if (this.reply && this.reply.text != null) {
const ast = parse(this.reply.text);
ast.filter(t => t.type == 'mention').forEach(x => {
const mention = x.host ? `@${x.username}@${x.host}` : `@${x.username}`;
if (this.text.indexOf(`${mention} `) == -1) {
this.text += `${mention} `;
}
});
}
this.$nextTick(() => {
// 書きかけの投稿を復元
const draft = JSON.parse(localStorage.getItem('drafts') || '{}')[this.draftId];

12
src/client/app/mobile/views/components/post-form.vue
View file

@ -49,6 +49,7 @@ import Vue from 'vue';
import * as XDraggable from 'vuedraggable';
import MkVisibilityChooser from '../../../common/views/components/visibility-chooser.vue';
import getKao from '../../../common/scripts/get-kao';
import parse from '../../../../../text/parse';
export default Vue.extend({
components: {
@ -78,6 +79,17 @@ export default Vue.extend({
this.text = `@${this.reply.user.username}@${this.reply.user.host} `;
}
if (this.reply && this.reply.text != null) {
const ast = parse(this.reply.text);
ast.filter(t => t.type == 'mention').forEach(x => {
const mention = x.host ? `@${x.username}@${x.host}` : `@${x.username}`;
if (this.text.indexOf(`${mention} `) == -1) {
this.text += `${mention} `;
}
});
}
this.$nextTick(() => {
this.focus();
});