Merge branch 'develop' into sw-notification-action

This commit is contained in:
tamaina
2021-03-09 19:57:02 +09:00
326 changed files with 3539 additions and 526 deletions

View File

@@ -121,6 +121,7 @@ import { checkWordMute } from '@/scripts/check-word-mute';
import { userPage } from '@/filters/user';
import * as os from '@/os';
import { noteActions, noteViewInterruptors } from '@/store';
import { reactionPicker } from '@/scripts/reaction-picker';
function markRawAll(...xs) {
for (const x of xs) {
@@ -504,7 +505,7 @@ export default defineComponent({
pleaseLogin();
this.operating = true;
this.blur();
os.pickReaction(this.$refs.reactButton, reaction => {
reactionPicker.show(this.$refs.reactButton, reaction => {
os.api('notes/reactions/create', {
noteId: this.appearNote.id,
reaction: reaction