Mizah/Sharkey
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

merge: upstream

Browse source
This commit is contained in:
Marie 2024-01-09 02:57:57 +01:00
commit 7552cea69a
No known key found for this signature in database
GPG key ID: 56569BBE47D2C828
413 changed files with 5517 additions and 2309 deletions
Download patch file Download diff file Expand all files Collapse all files

23
packages/frontend/src/components/SkNoteSub.vue
View file

@ -99,6 +99,7 @@ import MkSubNoteContent from '@/components/MkSubNoteContent.vue';
import MkCwButton from '@/components/MkCwButton.vue';
import { notePage } from '@/filters/note.js';
import * as os from '@/os.js';
import { misskeyApi } from '@/scripts/misskey-api.js';
import * as sound from '@/scripts/sound.js';
import { i18n } from '@/i18n.js';
import { $i } from '@/account.js';
@ -175,7 +176,7 @@ useNoteCapture({
});
if ($i) {
os.api('notes/renotes', {
misskeyApi('notes/renotes', {
noteId: appearNote.value.id,
userId: $i.id,
limit: 1,
@ -205,7 +206,7 @@ function react(viaKeyboard = false): void {
showMovedDialog();
sound.play('reaction');
if (props.note.reactionAcceptance === 'likeOnly') {
os.api('notes/like', {
misskeyApi('notes/like', {
noteId: props.note.id,
override: defaultLike.value,
});
@ -219,7 +220,7 @@ function react(viaKeyboard = false): void {
} else {
blur();
reactionPicker.show(reactButton.value, reaction => {
os.api('notes/reactions/create', {
misskeyApi('notes/reactions/create', {
noteId: props.note.id,
reaction: reaction,
});
@ -236,7 +237,7 @@ function like(): void {
pleaseLogin();
showMovedDialog();
sound.play('reaction');
os.api('notes/like', {
misskeyApi('notes/like', {
noteId: props.note.id,
override: defaultLike.value,
});
@ -252,14 +253,14 @@ function like(): void {
function undoReact(note): void {
const oldReaction = note.myReaction;
if (!oldReaction) return;
os.api('notes/reactions/delete', {
misskeyApi('notes/reactions/delete', {
noteId: note.id,
});
}
function undoRenote() : void {
if (!renoted.value) return;
os.api('notes/unrenote', {
misskeyApi('notes/unrenote', {
noteId: appearNote.value.id,
});
os.toast(i18n.ts.rmboost);
@ -333,7 +334,7 @@ function renote(visibility: 'public' | 'home' | 'followers' | 'specified' | 'loc
os.popup(MkRippleEffect, { x, y }, {}, 'end');
}
os.api('notes/create', {
misskeyApi('notes/create', {
renoteId: props.note.id,
channelId: props.note.channelId,
}).then(() => {
@ -349,7 +350,7 @@ function renote(visibility: 'public' | 'home' | 'followers' | 'specified' | 'loc
os.popup(MkRippleEffect, { x, y }, {}, 'end');
}
os.api('notes/create', {
misskeyApi('notes/create', {
renoteId: props.note.id,
localOnly: visibility === 'local' ? true : false,
visibility: visibility === 'local' || visibility === 'specified' ? props.note.visibility : visibility,
@ -369,7 +370,7 @@ function quote() {
renote: appearNote.value,
channel: appearNote.value.channel,
}).then(() => {
os.api('notes/renotes', {
misskeyApi('notes/renotes', {
noteId: props.note.id,
userId: $i.id,
limit: 1,
@ -391,7 +392,7 @@ function quote() {
os.post({
renote: appearNote.value,
}).then(() => {
os.api('notes/renotes', {
misskeyApi('notes/renotes', {
noteId: props.note.id,
userId: $i.id,
limit: 1,
@ -420,7 +421,7 @@ function menu(viaKeyboard = false): void {
}
if (props.detail) {
os.api('notes/children', {
misskeyApi('notes/children', {
noteId: props.note.id,
limit: numberOfReplies.value,
showQuotes: false,