jeder/FoundKey
1
0
Fork 0
forked from FoundKeyGang/FoundKey
Code Issues Pull requests Projects Releases Packages Wiki Activity

client: refactor to pleaseLoginOrRemote

Browse source
This commit is contained in:
Johann150 2023-03-04 00:08:12 +01:00
parent 5a263ec2c3
commit 49ae56a9e9
Signed by untrusted user: Johann150
GPG key ID: 9EE6577A2A06F8F1
5 changed files with 33 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
packages/client/src/components/note-detailed.vue
View file

@ -126,7 +126,7 @@ import XRenoteButton from './renote-button.vue';
import MkUrlPreview from '@/components/url-preview.vue'; import MkUrlPreview from '@/components/url-preview.vue';
import MkInstanceTicker from '@/components/instance-ticker.vue'; import MkInstanceTicker from '@/components/instance-ticker.vue';
import MkVisibility from '@/components/visibility.vue'; import MkVisibility from '@/components/visibility.vue';
import { pleaseLogin } from '@/scripts/please-login'; import { pleaseLoginOrRemote, urlForNote } from '@/scripts/please-login';
import { checkWordMute } from '@/scripts/check-word-mute'; import { checkWordMute } from '@/scripts/check-word-mute';
import { userPage } from '@/filters/user'; import { userPage } from '@/filters/user';
import { notePage } from '@/filters/note'; import { notePage } from '@/filters/note';
@ -195,7 +195,8 @@ useNoteCapture({
}); });
function reply(viaKeyboard = false): void { function reply(viaKeyboard = false): void {
pleaseLogin(); pleaseLoginOrRemote(urlForNote(appearNote));
os.post({ os.post({
reply: appearNote, reply: appearNote,
animation: !viaKeyboard, animation: !viaKeyboard,
@ -205,7 +206,8 @@ function reply(viaKeyboard = false): void {
} }
function react(): void { function react(): void {
pleaseLogin(); pleaseLoginOrRemote(urlForNote(appearNote));
blur(); blur();
reactionPicker.show(reactButton.value, reaction => { reactionPicker.show(reactButton.value, reaction => {
os.api('notes/reactions/create', { os.api('notes/reactions/create', {

8
packages/client/src/components/note.vue
View file

@ -115,7 +115,7 @@ import XRenoteButton from './renote-button.vue';
import MkUrlPreview from '@/components/url-preview.vue'; import MkUrlPreview from '@/components/url-preview.vue';
import MkInstanceTicker from '@/components/instance-ticker.vue'; import MkInstanceTicker from '@/components/instance-ticker.vue';
import MkVisibility from '@/components/visibility.vue'; import MkVisibility from '@/components/visibility.vue';
import { pleaseLogin } from '@/scripts/please-login'; import { pleaseLoginOrRemote, urlForNote } from '@/scripts/please-login';
import { focusPrev, focusNext } from '@/scripts/focus'; import { focusPrev, focusNext } from '@/scripts/focus';
import { checkWordMute } from '@/scripts/check-word-mute'; import { checkWordMute } from '@/scripts/check-word-mute';
import { userPage } from '@/filters/user'; import { userPage } from '@/filters/user';
@ -188,7 +188,8 @@ useNoteCapture({
}); });
function reply(viaKeyboard = false): void { function reply(viaKeyboard = false): void {
pleaseLogin(); pleaseLoginOrRemote(urlForNote(appearNote));
os.post({ os.post({
reply: appearNote, reply: appearNote,
animation: !viaKeyboard, animation: !viaKeyboard,
@ -198,7 +199,8 @@ function reply(viaKeyboard = false): void {
} }
function react(): void { function react(): void {
pleaseLogin(); pleaseLoginOrRemote(urlForNote(appearNote));
blur(); blur();
reactionPicker.show(reactButton.value, reaction => { reactionPicker.show(reactButton.value, reaction => {
os.api('notes/reactions/create', { os.api('notes/reactions/create', {

4
packages/client/src/components/poll.vue
View file

@ -25,7 +25,7 @@
import { computed, ref } from 'vue'; import { computed, ref } from 'vue';
import * as foundkey from 'foundkey-js'; import * as foundkey from 'foundkey-js';
import { sum } from '@/scripts/array'; import { sum } from '@/scripts/array';
import { pleaseLogin } from '@/scripts/please-login'; import { pleaseLoginOrRemote, urlForNote } from '@/scripts/please-login';
import * as os from '@/os'; import * as os from '@/os';
import { i18n } from '@/i18n'; import { i18n } from '@/i18n';
import { useInterval } from '@/scripts/use-interval'; import { useInterval } from '@/scripts/use-interval';
@ -68,7 +68,7 @@ if (props.note.poll.expiresAt) {
} }
const vote = async (id) => { const vote = async (id) => {
pleaseLogin(); pleaseLoginOrRemote(urlForNote(props.note));
if (props.readOnly || closed.value || isVoted.value) return; if (props.readOnly || closed.value || isVoted.value) return;

5
packages/client/src/components/renote-button.vue
View file

@ -17,7 +17,7 @@
import { computed, ref } from 'vue'; import { computed, ref } from 'vue';
import { Note } from 'foundkey-js/built/entities'; import { Note } from 'foundkey-js/built/entities';
import XDetails from '@/components/users-tooltip.vue'; import XDetails from '@/components/users-tooltip.vue';
import { pleaseLogin } from '@/scripts/please-login'; import { pleaseLoginOrRemote, urlForNote } from '@/scripts/please-login';
import * as os from '@/os'; import * as os from '@/os';
import { $i } from '@/account'; import { $i } from '@/account';
import { useTooltip } from '@/scripts/use-tooltip'; import { useTooltip } from '@/scripts/use-tooltip';
@ -51,7 +51,8 @@ useTooltip(buttonRef, async (showing) => {
}); });
function renote(viaKeyboard = false): void { function renote(viaKeyboard = false): void {
pleaseLogin(); pleaseLoginOrRemote(urlForNote(props.note));
os.popupMenu([{ os.popupMenu([{
text: i18n.ts.renote, text: i18n.ts.renote,
icon: 'fas fa-retweet', icon: 'fas fa-retweet',

18
packages/client/src/scripts/please-login.ts
View file

@ -2,6 +2,8 @@ import { defineAsyncComponent } from 'vue';
import { $i } from '@/account'; import { $i } from '@/account';
import { i18n } from '@/i18n'; import { i18n } from '@/i18n';
import { popup } from '@/os'; import { popup } from '@/os';
import { url } from '@/config';
import { entities } from 'foundkey-js';
export function pleaseLoginOrPage(path?: string) { export function pleaseLoginOrPage(path?: string) {
if ($i) return; if ($i) return;
@ -19,3 +21,19 @@ export function pleaseLoginOrPage(path?: string) {
if (!path) throw new Error('signin required'); if (!path) throw new Error('signin required');
} }
export function pleaseLoginOrRemote(url: string) {
if ($i) return;
popup(defineAsyncComponent(() => import('@/components/remote-interact.vue')), {
remoteUrl,
}, {}, 'closed');
throw new Error('signin required');
}
export function urlForNote(note: entities.Note): string {
return note.url
?? note.uri
?? `${url}/notes/${note.id}`;
}