mirror of
https://activitypub.software/TransFem-org/Sharkey
synced 2024-11-25 23:45:13 +00:00
parent
c107333f56
commit
1d814ba0e1
4 changed files with 57 additions and 9 deletions
|
@ -4,6 +4,7 @@ ChangeLog
|
||||||
10.81.0
|
10.81.0
|
||||||
----------
|
----------
|
||||||
* 動画のサムネイルを作成するように
|
* 動画のサムネイルを作成するように
|
||||||
|
* 個別に投稿のウォッチ/ウォッチ解除をできるように
|
||||||
* リモートの外部サービス認証情報を表示するように
|
* リモートの外部サービス認証情報を表示するように
|
||||||
* public の Renote/Reply/Quote先 が public以外 だったら、public => homeに
|
* public の Renote/Reply/Quote先 が public以外 だったら、public => homeに
|
||||||
* ユーザーページから管理者/モデレーターがアカウントのサイレンス/凍結をできるように
|
* ユーザーページから管理者/モデレーターがアカウントのサイレンス/凍結をできるように
|
||||||
|
|
|
@ -374,6 +374,8 @@ common/views/components/note-menu.vue:
|
||||||
copy-link: "リンクをコピー"
|
copy-link: "リンクをコピー"
|
||||||
favorite: "お気に入り"
|
favorite: "お気に入り"
|
||||||
unfavorite: "お気に入り解除"
|
unfavorite: "お気に入り解除"
|
||||||
|
watch: "ウォッチ"
|
||||||
|
unwatch: "ウォッチ解除"
|
||||||
pin: "ピン留め"
|
pin: "ピン留め"
|
||||||
unpin: "ピン留め解除"
|
unpin: "ピン留め解除"
|
||||||
delete: "削除"
|
delete: "削除"
|
||||||
|
|
|
@ -10,14 +10,15 @@ import i18n from '../../../i18n';
|
||||||
import { url } from '../../../config';
|
import { url } from '../../../config';
|
||||||
import copyToClipboard from '../../../common/scripts/copy-to-clipboard';
|
import copyToClipboard from '../../../common/scripts/copy-to-clipboard';
|
||||||
import { concat, intersperse } from '../../../../../prelude/array';
|
import { concat, intersperse } from '../../../../../prelude/array';
|
||||||
import { faCopy } from '@fortawesome/free-regular-svg-icons';
|
import { faCopy, faEye, faEyeSlash } from '@fortawesome/free-regular-svg-icons';
|
||||||
|
|
||||||
export default Vue.extend({
|
export default Vue.extend({
|
||||||
i18n: i18n('common/views/components/note-menu.vue'),
|
i18n: i18n('common/views/components/note-menu.vue'),
|
||||||
props: ['note', 'source'],
|
props: ['note', 'source'],
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
isFavorited: false
|
isFavorited: false,
|
||||||
|
isWatching: false
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
computed: {
|
computed: {
|
||||||
|
@ -55,6 +56,15 @@ export default Vue.extend({
|
||||||
text: this.$t('favorite'),
|
text: this.$t('favorite'),
|
||||||
action: this.favorite
|
action: this.favorite
|
||||||
},
|
},
|
||||||
|
this.note.userId != this.$store.state.i.id ? this.isWatching ? {
|
||||||
|
icon: faEyeSlash,
|
||||||
|
text: this.$t('unwatch'),
|
||||||
|
action: this.unwatch
|
||||||
|
} : {
|
||||||
|
icon: faEye,
|
||||||
|
text: this.$t('watch'),
|
||||||
|
action: this.watch
|
||||||
|
} : undefined,
|
||||||
this.note.userId == this.$store.state.i.id ? (this.$store.state.i.pinnedNoteIds || []).includes(this.note.id) ? {
|
this.note.userId == this.$store.state.i.id ? (this.$store.state.i.pinnedNoteIds || []).includes(this.note.id) ? {
|
||||||
icon: 'thumbtack',
|
icon: 'thumbtack',
|
||||||
text: this.$t('unpin'),
|
text: this.$t('unpin'),
|
||||||
|
@ -78,6 +88,7 @@ export default Vue.extend({
|
||||||
noteId: this.note.id
|
noteId: this.note.id
|
||||||
}).then(state => {
|
}).then(state => {
|
||||||
this.isFavorited = state.isFavorited;
|
this.isFavorited = state.isFavorited;
|
||||||
|
this.isWatching = state.isWatching;
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
|
|
||||||
|
@ -166,6 +177,30 @@ export default Vue.extend({
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
|
|
||||||
|
watch() {
|
||||||
|
this.$root.api('notes/watching/create', {
|
||||||
|
noteId: this.note.id
|
||||||
|
}).then(() => {
|
||||||
|
this.$root.dialog({
|
||||||
|
type: 'success',
|
||||||
|
splash: true
|
||||||
|
});
|
||||||
|
this.destroyDom();
|
||||||
|
});
|
||||||
|
},
|
||||||
|
|
||||||
|
unwatch() {
|
||||||
|
this.$root.api('notes/watching/delete', {
|
||||||
|
noteId: this.note.id
|
||||||
|
}).then(() => {
|
||||||
|
this.$root.dialog({
|
||||||
|
type: 'success',
|
||||||
|
splash: true
|
||||||
|
});
|
||||||
|
this.destroyDom();
|
||||||
|
});
|
||||||
|
},
|
||||||
|
|
||||||
closed() {
|
closed() {
|
||||||
this.$nextTick(() => {
|
this.$nextTick(() => {
|
||||||
this.destroyDom();
|
this.destroyDom();
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
import $ from 'cafy'; import ID, { transform } from '../../../../misc/cafy-id';
|
import $ from 'cafy'; import ID, { transform } from '../../../../misc/cafy-id';
|
||||||
import define from '../../define';
|
import define from '../../define';
|
||||||
import Favorite from '../../../../models/favorite';
|
import Favorite from '../../../../models/favorite';
|
||||||
|
import NoteWatching from '../../../../models/note-watching';
|
||||||
|
|
||||||
export const meta = {
|
export const meta = {
|
||||||
stability: 'stable',
|
stability: 'stable',
|
||||||
|
@ -25,14 +26,23 @@ export const meta = {
|
||||||
};
|
};
|
||||||
|
|
||||||
export default define(meta, (ps, user) => new Promise(async (res, rej) => {
|
export default define(meta, (ps, user) => new Promise(async (res, rej) => {
|
||||||
const favorite = await Favorite.count({
|
const [favorite, watching] = await Promise.all([
|
||||||
userId: user._id,
|
Favorite.count({
|
||||||
noteId: ps.noteId
|
userId: user._id,
|
||||||
}, {
|
noteId: ps.noteId
|
||||||
limit: 1
|
}, {
|
||||||
});
|
limit: 1
|
||||||
|
}),
|
||||||
|
NoteWatching.count({
|
||||||
|
userId: user._id,
|
||||||
|
noteId: ps.noteId
|
||||||
|
}, {
|
||||||
|
limit: 1
|
||||||
|
})
|
||||||
|
]);
|
||||||
|
|
||||||
res({
|
res({
|
||||||
isFavorited: favorite !== 0
|
isFavorited: favorite !== 0,
|
||||||
|
isWatching: watching !== 0
|
||||||
});
|
});
|
||||||
}));
|
}));
|
||||||
|
|
Loading…
Reference in a new issue