mirror of
https://git.joinsharkey.org/Sharkey/Sharkey.git
synced 2024-11-27 02:13:08 +02:00
Imprement promo read
This commit is contained in:
parent
8a7197726e
commit
52fb1237ec
3 changed files with 69 additions and 4 deletions
|
@ -415,6 +415,7 @@ accountSettings: "アカウント設定"
|
||||||
promotion: "プロモーション"
|
promotion: "プロモーション"
|
||||||
promote: "プロモート"
|
promote: "プロモート"
|
||||||
numberOfDays: "日数"
|
numberOfDays: "日数"
|
||||||
|
hideThisNote: "このノートを非表示"
|
||||||
|
|
||||||
_ago:
|
_ago:
|
||||||
unknown: "謎"
|
unknown: "謎"
|
||||||
|
|
|
@ -9,8 +9,8 @@
|
||||||
>
|
>
|
||||||
<x-sub v-for="note in conversation" :key="note.id" :note="note"/>
|
<x-sub v-for="note in conversation" :key="note.id" :note="note"/>
|
||||||
<x-sub :note="appearNote.reply" class="reply-to" v-if="appearNote.reply"/>
|
<x-sub :note="appearNote.reply" class="reply-to" v-if="appearNote.reply"/>
|
||||||
<div class="pinned" v-if="pinned"><fa :icon="faThumbtack"/> {{ $t('pinnedNote') }}</div>
|
<div class="info" v-if="pinned"><fa :icon="faThumbtack"/> {{ $t('pinnedNote') }}</div>
|
||||||
<div class="pinned" v-if="appearNote._prInjectionId_"><fa :icon="faBullhorn"/> {{ $t('promotion') }}</div>
|
<div class="info" v-if="appearNote._prInjectionId_"><fa :icon="faBullhorn"/> {{ $t('promotion') }}<button class="_textButton hide" @click="readPromo()">{{ $t('hideThisNote') }}</button></div>
|
||||||
<div class="renote" v-if="isRenote">
|
<div class="renote" v-if="isRenote">
|
||||||
<mk-avatar class="avatar" :user="note.user"/>
|
<mk-avatar class="avatar" :user="note.user"/>
|
||||||
<fa :icon="faRetweet"/>
|
<fa :icon="faRetweet"/>
|
||||||
|
@ -264,6 +264,13 @@ export default Vue.extend({
|
||||||
},
|
},
|
||||||
|
|
||||||
methods: {
|
methods: {
|
||||||
|
readPromo() {
|
||||||
|
(this as any).$root.api('promo/read', {
|
||||||
|
noteId: this.appearNote.id
|
||||||
|
});
|
||||||
|
this.hideThisNote = true;
|
||||||
|
},
|
||||||
|
|
||||||
capture(withHandler = false) {
|
capture(withHandler = false) {
|
||||||
if (this.$store.getters.isSignedIn) {
|
if (this.$store.getters.isSignedIn) {
|
||||||
this.connection.send(document.body.contains(this.$el) ? 'sn' : 's', { id: this.appearNote.id });
|
this.connection.send(document.body.contains(this.$el) ? 'sn' : 's', { id: this.appearNote.id });
|
||||||
|
@ -744,7 +751,9 @@ export default Vue.extend({
|
||||||
border-radius: 0 0 var(--radius) var(--radius);
|
border-radius: 0 0 var(--radius) var(--radius);
|
||||||
}
|
}
|
||||||
|
|
||||||
> .pinned {
|
> .info {
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
padding: 16px 32px 8px 32px;
|
padding: 16px 32px 8px 32px;
|
||||||
line-height: 24px;
|
line-height: 24px;
|
||||||
font-size: 90%;
|
font-size: 90%;
|
||||||
|
@ -758,9 +767,14 @@ export default Vue.extend({
|
||||||
> [data-icon] {
|
> [data-icon] {
|
||||||
margin-right: 4px;
|
margin-right: 4px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
> .hide {
|
||||||
|
margin-left: auto;
|
||||||
|
color: inherit;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
> .pinned + .article {
|
> .info + .article {
|
||||||
padding-top: 8px;
|
padding-top: 8px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
50
src/server/api/endpoints/promo/read.ts
Normal file
50
src/server/api/endpoints/promo/read.ts
Normal file
|
@ -0,0 +1,50 @@
|
||||||
|
import $ from 'cafy';
|
||||||
|
import { ID } from '../../../../misc/cafy-id';
|
||||||
|
import define from '../../define';
|
||||||
|
import { ApiError } from '../../error';
|
||||||
|
import { getNote } from '../../common/getters';
|
||||||
|
import { PromoReads } from '../../../../models';
|
||||||
|
import { genId } from '../../../../misc/gen-id';
|
||||||
|
|
||||||
|
export const meta = {
|
||||||
|
tags: ['notes'],
|
||||||
|
|
||||||
|
requireCredential: true as const,
|
||||||
|
|
||||||
|
params: {
|
||||||
|
noteId: {
|
||||||
|
validator: $.type(ID),
|
||||||
|
}
|
||||||
|
},
|
||||||
|
|
||||||
|
errors: {
|
||||||
|
noSuchNote: {
|
||||||
|
message: 'No such note.',
|
||||||
|
code: 'NO_SUCH_NOTE',
|
||||||
|
id: 'd785b897-fcd3-4fe9-8fc3-b85c26e6c932'
|
||||||
|
},
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
export default define(meta, async (ps, user) => {
|
||||||
|
const note = await getNote(ps.noteId).catch(e => {
|
||||||
|
if (e.id === '9725d0ce-ba28-4dde-95a7-2cbb2c15de24') throw new ApiError(meta.errors.noSuchNote);
|
||||||
|
throw e;
|
||||||
|
});
|
||||||
|
|
||||||
|
const exist = await PromoReads.findOne({
|
||||||
|
noteId: note.id,
|
||||||
|
userId: user.id
|
||||||
|
});
|
||||||
|
|
||||||
|
if (exist != null) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
await PromoReads.save({
|
||||||
|
id: genId(),
|
||||||
|
createdAt: new Date(),
|
||||||
|
noteId: note.id,
|
||||||
|
userId: user.id
|
||||||
|
});
|
||||||
|
});
|
Loading…
Reference in a new issue