summaryrefslogtreecommitdiff
path: root/packages/client/src/components
diff options
context:
space:
mode:
authorAndreas Nedbal <andreas.nedbal@in2code.de>2022-05-07 10:01:01 +0200
committerGitHub <noreply@github.com>2022-05-07 17:01:01 +0900
commita29ff7b1fa45e01bc7c097e8d770a4c4eedf2a8f (patch)
tree81f2856245d87e9fb9189435bdbeb6e100ba61e5 /packages/client/src/components
parentFix lint issues in emoji picker components (#8620) (diff)
downloadsharkey-a29ff7b1fa45e01bc7c097e8d770a4c4eedf2a8f.tar.gz
sharkey-a29ff7b1fa45e01bc7c097e8d770a4c4eedf2a8f.tar.bz2
sharkey-a29ff7b1fa45e01bc7c097e8d770a4c4eedf2a8f.zip
Fix lint issues in post form component (#8619)
* fix(client): fix lint issues in post form * Apply review suggestions from @Johann150 Co-authored-by: Johann150 <johann@qwertqwefsday.eu> Co-authored-by: Johann150 <johann@qwertqwefsday.eu>
Diffstat (limited to 'packages/client/src/components')
-rw-r--r--packages/client/src/components/post-form.vue97
1 files changed, 48 insertions, 49 deletions
diff --git a/packages/client/src/components/post-form.vue b/packages/client/src/components/post-form.vue
index 6d79736003..488c55231f 100644
--- a/packages/client/src/components/post-form.vue
+++ b/packages/client/src/components/post-form.vue
@@ -228,7 +228,7 @@ if (props.mention) {
text += ' ';
}
-if (props.reply && (props.reply.user.username != $i.username || (props.reply.user.host != null && props.reply.user.host != host))) {
+if (props.reply && (props.reply.user.username !== $i.username || (props.reply.user.host != null && props.reply.user.host !== host))) {
text = `@${props.reply.user.username}${props.reply.user.host != null ? '@' + toASCII(props.reply.user.host) : ''} `;
}
@@ -239,16 +239,15 @@ if (props.reply && props.reply.text != null) {
for (const x of extractMentions(ast)) {
const mention = x.host ?
`@${x.username}@${toASCII(x.host)}` :
- (otherHost == null || otherHost == host) ?
+ (otherHost == null || otherHost === host) ?
`@${x.username}` :
`@${x.username}@${toASCII(otherHost)}`;
// 自分は除外
- if ($i.username == x.username && x.host == null) continue;
- if ($i.username == x.username && x.host == host) continue;
+ if ($i.username === x.username && (x.host == null || x.host === host)) continue;
// 重複は除外
- if (text.indexOf(`${mention} `) != -1) continue;
+ if (text.includes(`${mention} `)) continue;
text += `${mention} `;
}
@@ -303,7 +302,7 @@ function checkMissingMention() {
const ast = mfm.parse(text);
for (const x of extractMentions(ast)) {
- if (!visibleUsers.some(u => (u.username === x.username) && (u.host == x.host))) {
+ if (!visibleUsers.some(u => (u.username === x.username) && (u.host === x.host))) {
hasNotSpecifiedMentions = true;
return;
}
@@ -316,7 +315,7 @@ function addMissingMention() {
const ast = mfm.parse(text);
for (const x of extractMentions(ast)) {
- if (!visibleUsers.some(u => (u.username === x.username) && (u.host == x.host))) {
+ if (!visibleUsers.some(u => (u.username === x.username) && (u.host === x.host))) {
os.api('users/show', { username: x.username, host: x.host }).then(user => {
visibleUsers.push(user);
});
@@ -357,7 +356,7 @@ function chooseFileFrom(ev) {
}
function detachFile(id) {
- files = files.filter(x => x.id != id);
+ files = files.filter(x => x.id !== id);
}
function updateFiles(_files) {
@@ -427,24 +426,24 @@ function clear() {
quoteId = null;
}
-function onKeydown(e: KeyboardEvent) {
- if ((e.which === 10 || e.which === 13) && (e.ctrlKey || e.metaKey) && canPost) post();
- if (e.which === 27) emit('esc');
+function onKeydown(ev: KeyboardEvent) {
+ if ((ev.which === 10 || ev.which === 13) && (ev.ctrlKey || ev.metaKey) && canPost) post();
+ if (ev.which === 27) emit('esc');
typing();
}
-function onCompositionUpdate(e: CompositionEvent) {
- imeText = e.data;
+function onCompositionUpdate(ev: CompositionEvent) {
+ imeText = ev.data;
typing();
}
-function onCompositionEnd(e: CompositionEvent) {
+function onCompositionEnd(ev: CompositionEvent) {
imeText = '';
}
-async function onPaste(e: ClipboardEvent) {
- for (const { item, i } of Array.from(e.clipboardData.items).map((item, i) => ({item, i}))) {
- if (item.kind == 'file') {
+async function onPaste(ev: ClipboardEvent) {
+ for (const { item, i } of Array.from(ev.clipboardData.items).map((item, i) => ({item, i}))) {
+ if (item.kind === 'file') {
const file = item.getAsFile();
const lio = file.name.lastIndexOf('.');
const ext = lio >= 0 ? file.name.slice(lio) : '';
@@ -453,10 +452,10 @@ async function onPaste(e: ClipboardEvent) {
}
}
- const paste = e.clipboardData.getData('text');
+ const paste = ev.clipboardData.getData('text');
if (!props.renote && !quoteId && paste.startsWith(url + '/notes/')) {
- e.preventDefault();
+ ev.preventDefault();
os.confirm({
type: 'info',
@@ -472,49 +471,49 @@ async function onPaste(e: ClipboardEvent) {
}
}
-function onDragover(e) {
- if (!e.dataTransfer.items[0]) return;
- const isFile = e.dataTransfer.items[0].kind == 'file';
- const isDriveFile = e.dataTransfer.types[0] == _DATA_TRANSFER_DRIVE_FILE_;
+function onDragover(ev) {
+ if (!ev.dataTransfer.items[0]) return;
+ const isFile = ev.dataTransfer.items[0].kind === 'file';
+ const isDriveFile = ev.dataTransfer.types[0] === _DATA_TRANSFER_DRIVE_FILE_;
if (isFile || isDriveFile) {
- e.preventDefault();
+ ev.preventDefault();
draghover = true;
- e.dataTransfer.dropEffect = e.dataTransfer.effectAllowed == 'all' ? 'copy' : 'move';
+ ev.dataTransfer.dropEffect = ev.dataTransfer.effectAllowed === 'all' ? 'copy' : 'move';
}
}
-function onDragenter(e) {
+function onDragenter(ev) {
draghover = true;
}
-function onDragleave(e) {
+function onDragleave(ev) {
draghover = false;
}
-function onDrop(e): void {
+function onDrop(ev): void {
draghover = false;
// ファイルだったら
- if (e.dataTransfer.files.length > 0) {
- e.preventDefault();
- for (const x of Array.from(e.dataTransfer.files)) upload(x);
+ if (ev.dataTransfer.files.length > 0) {
+ ev.preventDefault();
+ for (const x of Array.from(ev.dataTransfer.files)) upload(x);
return;
}
//#region ドライブのファイル
- const driveFile = e.dataTransfer.getData(_DATA_TRANSFER_DRIVE_FILE_);
- if (driveFile != null && driveFile != '') {
+ const driveFile = ev.dataTransfer.getData(_DATA_TRANSFER_DRIVE_FILE_);
+ if (driveFile != null && driveFile !== '') {
const file = JSON.parse(driveFile);
files.push(file);
- e.preventDefault();
+ ev.preventDefault();
}
//#endregion
}
function saveDraft() {
- const data = JSON.parse(localStorage.getItem('drafts') || '{}');
+ const draftData = JSON.parse(localStorage.getItem('drafts') || '{}');
- data[draftKey] = {
+ draftData[draftKey] = {
updatedAt: new Date(),
data: {
text: text,
@@ -527,20 +526,20 @@ function saveDraft() {
}
};
- localStorage.setItem('drafts', JSON.stringify(data));
+ localStorage.setItem('drafts', JSON.stringify(draftData));
}
function deleteDraft() {
- const data = JSON.parse(localStorage.getItem('drafts') || '{}');
+ const draftData = JSON.parse(localStorage.getItem('drafts') || '{}');
- delete data[draftKey];
+ delete draftData[draftKey];
- localStorage.setItem('drafts', JSON.stringify(data));
+ localStorage.setItem('drafts', JSON.stringify(draftData));
}
async function post() {
- let data = {
- text: text == '' ? undefined : text,
+ let postData = {
+ text: text === '' ? undefined : text,
fileIds: files.length > 0 ? files.map(f => f.id) : undefined,
replyId: props.reply ? props.reply.id : undefined,
renoteId: props.renote ? props.renote.id : quoteId ? quoteId : undefined,
@@ -549,18 +548,18 @@ async function post() {
cw: useCw ? cw || '' : undefined,
localOnly: localOnly,
visibility: visibility,
- visibleUserIds: visibility == 'specified' ? visibleUsers.map(u => u.id) : undefined,
+ visibleUserIds: visibility === 'specified' ? visibleUsers.map(u => u.id) : undefined,
};
if (withHashtags && hashtags && hashtags.trim() !== '') {
const hashtags_ = hashtags.trim().split(' ').map(x => x.startsWith('#') ? x : '#' + x).join(' ');
- data.text = data.text ? `${data.text} ${hashtags_}` : hashtags_;
+ postData.text = postData.text ? `${postData.text} ${hashtags_}` : hashtags_;
}
// plugin
if (notePostInterruptors.length > 0) {
for (const interruptor of notePostInterruptors) {
- data = await interruptor.handler(JSON.parse(JSON.stringify(data)));
+ postData = await interruptor.handler(JSON.parse(JSON.stringify(postData)));
}
}
@@ -572,13 +571,13 @@ async function post() {
}
posting = true;
- os.api('notes/create', data, token).then(() => {
+ os.api('notes/create', postData, token).then(() => {
clear();
nextTick(() => {
deleteDraft();
emit('posted');
- if (data.text && data.text != '') {
- const hashtags_ = mfm.parse(data.text).filter(x => x.type === 'hashtag').map(x => x.props.hashtag);
+ if (postData.text && postData.text !== '') {
+ const hashtags_ = mfm.parse(postData.text).filter(x => x.type === 'hashtag').map(x => x.props.hashtag);
const history = JSON.parse(localStorage.getItem('hashtags') || '[]') as string[];
localStorage.setItem('hashtags', JSON.stringify(unique(hashtags_.concat(history))));
}
@@ -662,7 +661,7 @@ onMounted(() => {
cw = draft.data.cw;
visibility = draft.data.visibility;
localOnly = draft.data.localOnly;
- files = (draft.data.files || []).filter(e => e);
+ files = (draft.data.files || []).filter(draftFile => draftFile);
if (draft.data.poll) {
poll = draft.data.poll;
}