Skip to content

Commit ac5f172

Browse files
mei23mei23
committed
引用ボタン Resolve #4493 
1 parent 366313f commit ac5f172

File tree

7 files changed

+43
-13
lines changed

7 files changed

+43
-13
lines changed

‎locales/en-US.yml

+2
Original file line numberDiff line numberDiff line change
@@ -1161,11 +1161,13 @@ desktop/views/components/note-detail.vue:
11611161
location: "Location"
11621162
reply: "Reply"
11631163
renote: "Renote"
1164+
quote: "Quote"
11641165
add-reaction: "Add a reaction"
11651166
undo-reaction: "Reverse reaction"
11661167
desktop/views/components/note.vue:
11671168
reply: "Reply"
11681169
renote: "Renote"
1170+
quote: "Quote"
11691171
add-reaction: "Add a reaction"
11701172
undo-reaction: "Reverse reaction"
11711173
detail: "Details"

‎locales/ja-JP.yml

+2
Original file line numberDiff line numberDiff line change
@@ -1265,12 +1265,14 @@ desktop/views/components/note-detail.vue:
12651265
location: "位置情報"
12661266
reply: "返信"
12671267
renote: "Renote"
1268+
quote: "引用"
12681269
add-reaction: "リアクション"
12691270
undo-reaction: "リアクション解除"
12701271

12711272
desktop/views/components/note.vue:
12721273
reply: "返信"
12731274
renote: "Renote"
1275+
quote: "引用"
12741276
add-reaction: "リアクション"
12751277
undo-reaction: "リアクション解除"
12761278
detail: "詳細"

‎src/client/app/common/scripts/note-mixin.ts

+6
Original file line numberDiff line numberDiff line change
@@ -155,6 +155,12 @@ export default (opts: Opts = {}) => ({
155155
});
156156
},
157157

158+
directRenote() {
159+
this.$root.api('notes/create', {
160+
renoteId: this.appearNote.id
161+
});
162+
},
163+
158164
undoRenote() {
159165
this.$root.api('notes/delete', {
160166
noteId: this.appearNote.myRenoteId

‎src/client/app/desktop/views/components/note-detail.vue

+8-3
Original file line numberDiff line numberDiff line change
@@ -67,15 +67,20 @@
6767
<fa icon="reply"/>
6868
<p class="count" v-if="appearNote.repliesCount + appearNote.quoteCount > 0">{{ appearNote.repliesCount + appearNote.quoteCount }}</p>
6969
</button>
70+
71+
<!-- Renote -->
7072
<button v-if="appearNote.myRenoteId != null" class="renoteButton renoted" @click="undoRenote()" title="Undo">
7173
<fa icon="retweet"/><p class="count" v-if="appearNote.renoteCount - appearNote.quoteCount > 0">{{ appearNote.renoteCount - appearNote.quoteCount }}</p>
7274
</button>
73-
<button v-else-if="['public', 'home'].includes(appearNote.visibility)" class="renoteButton" @click="renote()" :title="$t('renote')">
75+
<button v-else-if="['public', 'home'].includes(appearNote.visibility)" class="renoteButton" @click="directRenote()" :title="$t('renote')">
7476
<fa icon="retweet"/><p class="count" v-if="appearNote.renoteCount - appearNote.quoteCount > 0">{{ appearNote.renoteCount - appearNote.quoteCount }}</p>
7577
</button>
76-
<button v-else class="inhibitedButton">
77-
<fa icon="ban"/>
78+
79+
<!-- Quote -->
80+
<button v-if="['public', 'home'].includes(appearNote.visibility)" class="renoteButton" @click="renote()" :title="$t('quote')">
81+
<fa icon="quote-right"/><p class="count" v-if="appearNote.quoteCount > 0">{{ appearNote.quoteCount }}</p>
7882
</button>
83+
7984
<button v-if="appearNote.myReaction == null" class="reactionButton" @click="react()" ref="reactButton" :title="$t('add-reaction')">
8085
<fa-layers>
8186
<fa :icon="faLaugh"/>

‎src/client/app/desktop/views/components/note.vue

+9-3
Original file line numberDiff line numberDiff line change
@@ -76,17 +76,23 @@
7676
<fa icon="reply"/>
7777
<p class="count" v-if="appearNote.repliesCount + appearNote.quoteCount > 0">{{ appearNote.repliesCount + appearNote.quoteCount }}</p>
7878
</button>
79+
80+
<!-- Renote -->
7981
<button v-if="appearNote.myRenoteId != null" class="renoteButton button renoted" @click="undoRenote()" title="Undo">
8082
<fa icon="retweet"/>
8183
<p class="count" v-if="appearNote.renoteCount - appearNote.quoteCount > 0">{{ appearNote.renoteCount - appearNote.quoteCount }}</p>
8284
</button>
83-
<button v-else-if="['public', 'home'].includes(appearNote.visibility)" class="renoteButton button" @click="renote()" :title="$t('renote')">
85+
<button v-else-if="['public', 'home'].includes(appearNote.visibility)" class="renoteButton button" @click="directRenote()" :title="$t('renote')">
8486
<fa icon="retweet"/>
8587
<p class="count" v-if="appearNote.renoteCount - appearNote.quoteCount > 0">{{ appearNote.renoteCount - appearNote.quoteCount }}</p>
8688
</button>
87-
<button v-else class="inhibitedButton button">
88-
<fa icon="ban"/>
89+
90+
<!-- Quote -->
91+
<button v-if="['public', 'home'].includes(appearNote.visibility)" class="renoteButton button" @click="renote()" :title="$t('quote')">
92+
<fa icon="quote-right"/>
93+
<p class="count" v-if="appearNote.quoteCount > 0">{{ appearNote.quoteCount }}</p>
8994
</button>
95+
9096
<button v-if="appearNote.myReaction == null" class="reactionButton button" @click="react()" ref="reactButton" :title="$t('add-reaction')">
9197
<fa-layers>
9298
<fa :icon="faLaugh"/>

‎src/client/app/mobile/views/components/note-detail.vue

+8-3
Original file line numberDiff line numberDiff line change
@@ -66,15 +66,20 @@
6666
<fa icon="reply"/>
6767
<p class="count" v-if="appearNote.repliesCount + appearNote.quoteCount > 0">{{ appearNote.repliesCount + appearNote.quoteCount }}</p>
6868
</button>
69+
70+
<!-- Renote -->
6971
<button v-if="appearNote.myRenoteId != null" @click="undoRenote()" title="Undo" class="renoted">
7072
<fa icon="retweet"/><p class="count" v-if="appearNote.renoteCount - appearNote.quoteCount > 0">{{ appearNote.renoteCount - appearNote.quoteCount }}</p>
7173
</button>
72-
<button v-else-if="['public', 'home'].includes(appearNote.visibility)" @click="renote()" title="Renote">
74+
<button v-else-if="['public', 'home'].includes(appearNote.visibility)" @click="directRenote()" title="Renote">
7375
<fa icon="retweet"/><p class="count" v-if="appearNote.renoteCount - appearNote.quoteCount > 0">{{ appearNote.renoteCount - appearNote.quoteCount }}</p>
7476
</button>
75-
<button v-else>
76-
<fa icon="ban"/>
77+
78+
<!-- Quote -->
79+
<button v-if="['public', 'home'].includes(appearNote.visibility)" @click="renote()" title="Quote">
80+
<fa icon="quote-right"/><p class="count" v-if="appearNote.quoteCount > 0">{{ appearNote.quoteCount }}</p>
7781
</button>
82+
7883
<button v-if="appearNote.myReaction == null" class="reactionButton" @click="react()" ref="reactButton">
7984
<fa-layers>
8085
<fa :icon="faLaugh"/>

‎src/client/app/mobile/views/components/note.vue

+8-4
Original file line numberDiff line numberDiff line change
@@ -67,16 +67,20 @@
6767
<fa icon="reply"/>
6868
<p class="count" v-if="appearNote.repliesCount + appearNote.quoteCount > 0">{{ appearNote.repliesCount + appearNote.quoteCount }}</p>
6969
</button>
70+
71+
<!-- Renote -->
7072
<button v-if="appearNote.myRenoteId != null" @click="undoRenote()" title="Undo" class="button renoted">
7173
<fa icon="retweet"/><p class="count" v-if="appearNote.renoteCount - appearNote.quoteCount > 0">{{ appearNote.renoteCount - appearNote.quoteCount }}</p>
72-
7374
</button>
74-
<button v-else-if="['public', 'home'].includes(appearNote.visibility)" @click="renote()" title="Renote" class="button">
75+
<button v-else-if="['public', 'home'].includes(appearNote.visibility)" @click="directRenote()" title="Renote" class="button">
7576
<fa icon="retweet"/><p class="count" v-if="appearNote.renoteCount - appearNote.quoteCount > 0">{{ appearNote.renoteCount - appearNote.quoteCount }}</p>
7677
</button>
77-
<button v-else class="button">
78-
<fa icon="ban"/>
78+
79+
<!-- Quote -->
80+
<button v-if="['public', 'home'].includes(appearNote.visibility)" @click="renote()" title="Quote" class="button">
81+
<fa icon="quote-right"/><p class="count" v-if="appearNote.quoteCount > 0">{{ appearNote.quoteCount }}</p>
7982
</button>
83+
8084
<button v-if="appearNote.myReaction == null" class="button" @click="react()" ref="reactButton">
8185
<fa-layers>
8286
<fa :icon="faLaugh"/>

0 commit comments

Comments
 (0)