chore: use vite meta.env
continuous-integration/drone/push Build is failing Details

This commit is contained in:
Kieran 2024-01-04 10:10:04 +00:00
parent 013d383572
commit c6f89af1cb
Signed by: Kieran
GPG Key ID: DE71CEB3925BE941
5 changed files with 10 additions and 11 deletions

1
.env Normal file
View File

@ -0,0 +1 @@
VITE_SINGLE_PUBLISHER=

View File

@ -4,7 +4,6 @@
declare const __XXX: boolean;
declare const __XXX_HOST: string;
declare const __ZAP_STREAM_VERSION__: string;
declare const __SINGLE_PUBLISHER: string;
declare module "*.jpg" {
const value: unknown;

View File

@ -15,13 +15,13 @@ export function useStreamsFeed(tag?: string) {
rb.withOptions({
leaveOpen: true,
});
if (__SINGLE_PUBLISHER) {
if (import.meta.env.VITE_SINGLE_PUBLISHER) {
if (tag) {
rb.withFilter().kinds([LIVE_STREAM]).tag("t", [tag]).authors([__SINGLE_PUBLISHER]);
rb.withFilter().kinds([LIVE_STREAM]).tag("t", [tag]).tag("p", [__SINGLE_PUBLISHER]);
rb.withFilter().kinds([LIVE_STREAM]).tag("t", [tag]).authors([import.meta.env.VITE_SINGLE_PUBLISHER]);
rb.withFilter().kinds([LIVE_STREAM]).tag("t", [tag]).tag("p", [import.meta.env.VITE_SINGLE_PUBLISHER]);
} else {
rb.withFilter().kinds([LIVE_STREAM]).authors([__SINGLE_PUBLISHER]);
rb.withFilter().kinds([LIVE_STREAM]).tag("p", [__SINGLE_PUBLISHER]);
rb.withFilter().kinds([LIVE_STREAM]).authors([import.meta.env.VITE_SINGLE_PUBLISHER]);
rb.withFilter().kinds([LIVE_STREAM]).tag("p", [import.meta.env.VITE_SINGLE_PUBLISHER]);
}
} else {
if (tag) {
@ -48,11 +48,11 @@ export function useStreamsFeed(tag?: string) {
if (feed.data) {
if (__XXX) {
return [...feed.data].filter(
a => findTag(a, "content-warning") !== undefined && (!__SINGLE_PUBLISHER || __SINGLE_PUBLISHER === getHost(a))
a => findTag(a, "content-warning") !== undefined && (!import.meta.env.VITE_SINGLE_PUBLISHER || import.meta.env.VITE_SINGLE_PUBLISHER === getHost(a))
);
} else {
return [...feed.data].filter(
a => findTag(a, "content-warning") === undefined && (!__SINGLE_PUBLISHER || __SINGLE_PUBLISHER === getHost(a))
a => findTag(a, "content-warning") === undefined && (!import.meta.env.VITE_SINGLE_PUBLISHER || import.meta.env.VITE_SINGLE_PUBLISHER === getHost(a))
);
}
}

View File

@ -57,7 +57,7 @@ export function LayoutPage() {
return (
<>
{(!__SINGLE_PUBLISHER || __SINGLE_PUBLISHER === login.pubkey) && (
{(!import.meta.env.VITE_SINGLE_PUBLISHER || import.meta.env.VITE_SINGLE_PUBLISHER === login.pubkey) && (
<NewStreamDialog btnClassName="btn btn-primary" />
)}
<Menu

View File

@ -41,7 +41,6 @@ export default defineConfig({
define: {
global: {},
__XXX: process.env["__XXX"] || JSON.stringify(false),
__XXX_HOST: JSON.stringify("https://xxzap.com"),
__SINGLE_PUBLISHER: JSON.stringify(process.env.__SINGLE_PUBLISHER),
__XXX_HOST: JSON.stringify("https://xxzap.com")
},
});