graphite/Sharkey
1
0
Fork 0
mirror of https://git.joinsharkey.org/Sharkey/Sharkey.git synced 2024-11-10 15:13:09 +02:00
Code Issues Projects Releases Packages Wiki Activity

Improve hashtag suggestion

Browse source
This commit is contained in:
syuilo 2018-07-21 03:15:31 +09:00
parent 7316352ff5
commit afcf2fddb1
2 changed files with 22 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/client/app/common/views/components/autocomplete.vue
View file

@ -144,6 +144,10 @@ export default Vue.extend({
}); });
} }
} else if (this.type == 'hashtag') { } else if (this.type == 'hashtag') {
if (this.q == null || this.q == '') {
this.hashtags = JSON.parse(localStorage.getItem('hashtags') || '[]');
this.fetching = false;
} else {
const cacheKey = 'autocomplete:hashtag:' + this.q; const cacheKey = 'autocomplete:hashtag:' + this.q;
const cache = sessionStorage.getItem(cacheKey); const cache = sessionStorage.getItem(cacheKey);
if (cache) { if (cache) {
@ -162,6 +166,7 @@ export default Vue.extend({
sessionStorage.setItem(cacheKey, JSON.stringify(hashtags)); sessionStorage.setItem(cacheKey, JSON.stringify(hashtags));
}); });
} }
}
} else if (this.type == 'emoji') { } else if (this.type == 'emoji') {
const matched = []; const matched = [];
emjdb.some(x => { emjdb.some(x => {

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

@ -79,7 +79,10 @@ class Autocomplete {
hashtagIndex == -1 ? Infinity : hashtagIndex, hashtagIndex == -1 ? Infinity : hashtagIndex,
emojiIndex == -1 ? Infinity : emojiIndex); emojiIndex == -1 ? Infinity : emojiIndex);
if (start == Infinity) return; if (start == Infinity) {
this.close();
return;
}
const isMention = mentionIndex == start; const isMention = mentionIndex == start;
const isHashtag = hashtagIndex == start; const isHashtag = hashtagIndex == start;
@ -97,7 +100,7 @@ class Autocomplete {
if (isHashtag || opened == false) { if (isHashtag || opened == false) {
const hashtag = text.substr(hashtagIndex + 1); const hashtag = text.substr(hashtagIndex + 1);
if (hashtag != '' && !hashtag.includes(' ') && !hashtag.includes('\n')) { if (!hashtag.includes(' ') && !hashtag.includes('\n')) {
this.open('hashtag', hashtag); this.open('hashtag', hashtag);
opened = true; opened = true;
} }