HoovesSocial/hippofish
2
0
Fork 0
Code Issues 3 Pull requests 1 Projects Releases Packages Wiki Activity Actions

fix (backend): check URL properly

Browse source
This commit is contained in:
naskya 2024-06-22 23:30:21 +09:00
parent aaa51e1bb4
commit 5a2d1c2010
No known key found for this signature in database
GPG key ID: 712D413B3A9FED5C
2 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
packages/backend/src/server/api/endpoints/users/show.ts
View file

@ -87,14 +87,20 @@ export const paramDef = {
export default define(meta, paramDef, async (ps, me) => {
let user;
const isAdminOrModerator = me && (me.isAdmin || me.isModerator);
const isAdminOrModerator = me != null && (me.isAdmin || me.isModerator);
if (ps.userIds) {
if (ps.userIds.length === 0) {
return [];
}
const isUrl = ps.userIds[0].startsWith("http");
let isUrl = false;
try {
const url = new URL(ps.userIds[0]);
isUrl = ["http", "https"].includes(url.protocol);
} catch (_) {}
let users: User[];
if (isUrl) {
users = await Users.findBy(

2
packages/client/src/pages/user/home.vue
View file

@ -360,10 +360,8 @@ import { getStaticImageUrl } from "@/scripts/get-static-image-url";
import number from "@/filters/number";
import { userPage } from "@/filters/user";
import { defaultStore } from "@/store";
import * as os from "@/os";
import { i18n } from "@/i18n";
import { isModerator, isSignedIn, me } from "@/me";
import { host } from "@/config";
import icon from "@/scripts/icon";
const XPhotos = defineAsyncComponent(() => import("./index.photos.vue"));