mirror of
https://github.com/kokonect-link/cherrypick
synced 2024-11-23 22:56:53 +09:00
Merge branch 'develop' of https://github.com/kokonect-link/cherrypick into develop
This commit is contained in:
NoriDev
commit
59ad05a702
@ -56,17 +56,17 @@ dbReplications: false
|
||||
# You can configure any number of replicas here
|
||||
#dbSlaves:
|
||||
# -
|
||||
# host:
|
||||
# port:
|
||||
# db:
|
||||
# user:
|
||||
# pass:
|
||||
# host: localhost
|
||||
# port: 5433
|
||||
# db: cherrypick
|
||||
# user: example-cherrypick-user
|
||||
# pass: example-cherrypick-pass
|
||||
# -
|
||||
# host:
|
||||
# port:
|
||||
# db:
|
||||
# user:
|
||||
# pass:
|
||||
# host: localhost
|
||||
# port: 5434
|
||||
# db: cherrypick
|
||||
# user: example-cherrypick-user
|
||||
# pass: example-cherrypick-pass
|
||||
|
||||
# ┌─────────────────────┐
|
||||
#───┘ Redis configuration └─────────────────────────────────────
|
||||
@ -154,6 +154,9 @@ id: 'aidx'
|
||||
# saKeyPath: /path/to/service-account-key.json
|
||||
# logName: cherrypick
|
||||
|
||||
# Override the file URL rendering in ActivityPub (Object Storage file only)
|
||||
#apFileBaseUrl: https://example.tld/
|
||||
|
||||
# Proxy for HTTP/HTTPS
|
||||
#proxy: http://127.0.0.1:3128
|
||||
|
||||
|
||||
@ -60,17 +60,17 @@ dbReplications: false
|
||||
# You can configure any number of replicas here
|
||||
#dbSlaves:
|
||||
# -
|
||||
# host:
|
||||
# port:
|
||||
# db:
|
||||
# user:
|
||||
# pass:
|
||||
# host: localhost
|
||||
# port: 5433
|
||||
# db: cherrypick
|
||||
# user: example-cherrypick-user
|
||||
# pass: example-cherrypick-pass
|
||||
# -
|
||||
# host:
|
||||
# port:
|
||||
# db:
|
||||
# user:
|
||||
# pass:
|
||||
# host: localhost
|
||||
# port: 5434
|
||||
# db: cherrypick
|
||||
# user: example-cherrypick-user
|
||||
# pass: example-cherrypick-pass
|
||||
|
||||
# ┌─────────────────────┐
|
||||
#───┘ Redis configuration └─────────────────────────────────────
|
||||
@ -172,6 +172,9 @@ id: 'aidx'
|
||||
# saKeyPath: /path/to/service-account-key.json
|
||||
# logName: cherrypick
|
||||
|
||||
# Override the file URL rendering in ActivityPub (Object Storage file only)
|
||||
#apFileBaseUrl: https://example.tld/
|
||||
|
||||
# Proxy for HTTP/HTTPS
|
||||
#proxy: http://127.0.0.1:3128
|
||||
|
||||
|
||||
@ -56,17 +56,17 @@ dbReplications: false
|
||||
# You can configure any number of replicas here
|
||||
#dbSlaves:
|
||||
# -
|
||||
# host:
|
||||
# port:
|
||||
# db:
|
||||
# user:
|
||||
# pass:
|
||||
# host: localhost
|
||||
# port: 5433
|
||||
# db: cherrypick
|
||||
# user: example-cherrypick-user
|
||||
# pass: example-cherrypick-pass
|
||||
# -
|
||||
# host:
|
||||
# port:
|
||||
# db:
|
||||
# user:
|
||||
# pass:
|
||||
# host: localhost
|
||||
# port: 5434
|
||||
# db: cherrypick
|
||||
# user: example-cherrypick-user
|
||||
# pass: example-cherrypick-pass
|
||||
|
||||
# ┌─────────────────────┐
|
||||
#───┘ Redis configuration └─────────────────────────────────────
|
||||
@ -154,6 +154,9 @@ id: 'aidx'
|
||||
# saKeyPath: /path/to/service-account-key.json
|
||||
# logName: cherrypick
|
||||
|
||||
# Override the file URL rendering in ActivityPub (Object Storage file only)
|
||||
#apFileBaseUrl: https://example.tld/
|
||||
|
||||
# Proxy for HTTP/HTTPS
|
||||
#proxy: http://127.0.0.1:3128
|
||||
|
||||
|
||||
@ -77,17 +77,17 @@ dbReplications: false
|
||||
# You can configure any number of replicas here
|
||||
#dbSlaves:
|
||||
# -
|
||||
# host:
|
||||
# port:
|
||||
# db:
|
||||
# user:
|
||||
# pass:
|
||||
# host: localhost
|
||||
# port: 5433
|
||||
# db: cherrypick
|
||||
# user: example-cherrypick-user
|
||||
# pass: example-cherrypick-pass
|
||||
# -
|
||||
# host:
|
||||
# port:
|
||||
# db:
|
||||
# user:
|
||||
# pass:
|
||||
# host: localhost
|
||||
# port: 5434
|
||||
# db: cherrypick
|
||||
# user: example-cherrypick-user
|
||||
# pass: example-cherrypick-pass
|
||||
|
||||
# ┌─────────────────────┐
|
||||
#───┘ Redis configuration └─────────────────────────────────────
|
||||
@ -174,6 +174,9 @@ id: "aidx"
|
||||
# saKeyPath: /path/to/service-account-key.json
|
||||
# logName: cherrypick
|
||||
|
||||
# Override the file URL rendering in ActivityPub (Object Storage file only)
|
||||
#apFileBaseUrl: https://example.tld/
|
||||
|
||||
# Proxy for HTTP/HTTPS
|
||||
#proxy: http://127.0.0.1:3128
|
||||
|
||||
|
||||
@ -86,6 +86,8 @@ type Source = {
|
||||
logName?: string;
|
||||
}
|
||||
|
||||
apFileBaseUrl?: string;
|
||||
|
||||
mediaProxy?: string;
|
||||
proxyRemoteFiles?: boolean;
|
||||
videoThumbnailGenerator?: string;
|
||||
@ -145,6 +147,7 @@ export type Config = {
|
||||
relashionshipJobPerSec: number | undefined;
|
||||
deliverJobMaxAttempts: number | undefined;
|
||||
inboxJobMaxAttempts: number | undefined;
|
||||
apFileBaseUrl: string | undefined;
|
||||
proxyRemoteFiles: boolean | undefined;
|
||||
signToActivityPubGet: boolean | undefined;
|
||||
|
||||
@ -250,6 +253,7 @@ export function loadConfig(): Config {
|
||||
inboxJobMaxAttempts: config.inboxJobMaxAttempts,
|
||||
proxyRemoteFiles: config.proxyRemoteFiles,
|
||||
signToActivityPubGet: config.signToActivityPubGet,
|
||||
apFileBaseUrl: config.apFileBaseUrl,
|
||||
mediaProxy: externalMediaProxy ?? internalMediaProxy,
|
||||
externalMediaProxyEnabled: externalMediaProxy !== null && externalMediaProxy !== internalMediaProxy,
|
||||
videoThumbnailGenerator: config.videoThumbnailGenerator ?
|
||||
|
||||
@ -166,7 +166,7 @@ export class ApRendererService {
|
||||
return {
|
||||
type: 'Document',
|
||||
mediaType: file.webpublicType ?? file.type,
|
||||
url: this.driveFileEntityService.getPublicUrl(file),
|
||||
url: this.driveFileEntityService.getPublicUrl(file, undefined, true),
|
||||
name: file.comment,
|
||||
};
|
||||
}
|
||||
@ -245,7 +245,7 @@ export class ApRendererService {
|
||||
public renderImage(file: MiDriveFile): IApImage {
|
||||
return {
|
||||
type: 'Image',
|
||||
url: this.driveFileEntityService.getPublicUrl(file),
|
||||
url: this.driveFileEntityService.getPublicUrl(file, undefined, true),
|
||||
sensitive: file.isSensitive,
|
||||
name: file.comment,
|
||||
};
|
||||
|
||||
@ -250,8 +250,8 @@ export class ApPersonService implements OnModuleInit {
|
||||
return {
|
||||
avatarId: avatar?.id ?? null,
|
||||
bannerId: banner?.id ?? null,
|
||||
avatarUrl: avatar ? this.driveFileEntityService.getPublicUrl(avatar, 'avatar') : null,
|
||||
bannerUrl: banner ? this.driveFileEntityService.getPublicUrl(banner) : null,
|
||||
avatarUrl: avatar ? this.driveFileEntityService.getPublicUrl(avatar, 'avatar', true) : null,
|
||||
bannerUrl: banner ? this.driveFileEntityService.getPublicUrl(banner, undefined, true) : null,
|
||||
avatarBlurhash: avatar?.blurhash ?? null,
|
||||
bannerBlurhash: banner?.blurhash ?? null,
|
||||
};
|
||||
|
||||
@ -107,7 +107,7 @@ export class DriveFileEntityService {
|
||||
}
|
||||
|
||||
@bindThis
|
||||
public getPublicUrl(file: MiDriveFile, mode?: 'avatar'): string { // static = thumbnail
|
||||
public getPublicUrl(file: MiDriveFile, mode?: 'avatar', ap?: boolean): string { // static = thumbnail
|
||||
// リモートかつメディアプロキシ
|
||||
if (file.uri != null && file.userHost != null && this.config.externalMediaProxyEnabled) {
|
||||
return this.getProxiedUrl(file.uri, mode);
|
||||
@ -129,6 +129,16 @@ export class DriveFileEntityService {
|
||||
if (mode === 'avatar') {
|
||||
return this.getProxiedUrl(url, 'avatar');
|
||||
}
|
||||
|
||||
if (ap && this.config.apFileBaseUrl) {
|
||||
const baseUrl = this.config.apFileBaseUrl;
|
||||
const isValidBaseUrl = /^https?:\/\/[\w.-]+\.[a-zA-Z]{2,}(\/.*)?$/i.test(baseUrl);
|
||||
if (isValidBaseUrl) {
|
||||
const trimmedBaseUrl = baseUrl.replace(/\/$/, '');
|
||||
return url.replace(/^https?:\/\/[\w.-]+\.[a-zA-Z]{2,}/, trimmedBaseUrl);
|
||||
}
|
||||
}
|
||||
|
||||
return url;
|
||||
}
|
||||
|
||||
|
||||
@ -17,6 +17,7 @@
|
||||
},
|
||||
"dependencies": {
|
||||
"@discordapp/twemoji": "14.1.2",
|
||||
"@fontsource/jetbrains-mono": "^5.0.12",
|
||||
"@github/webauthn-json": "2.1.1",
|
||||
"@rollup/plugin-alias": "5.0.0",
|
||||
"@rollup/plugin-json": "6.0.0",
|
||||
@ -54,6 +55,8 @@
|
||||
"json5": "2.2.3",
|
||||
"matter-js": "0.19.0",
|
||||
"photoswipe": "5.4.1",
|
||||
"pretendard": "^1.3.8",
|
||||
"pretendard-jp": "^1.3.8",
|
||||
"prismjs": "1.29.0",
|
||||
"punycode": "2.3.0",
|
||||
"querystring": "0.2.1",
|
||||
|
||||
@ -6,44 +6,28 @@
|
||||
* SPDX-License-Identifier: AGPL-3.0-only
|
||||
*/
|
||||
|
||||
@mixin font($font-family, $font-weight, $font-style, $font-local, $font-url) {
|
||||
@font-face {
|
||||
font-family: $font-family;
|
||||
font-weight: $font-weight;
|
||||
font-style: $font-style;
|
||||
font-display: swap;
|
||||
src: local($font-local), url($font-url) format('woff2');
|
||||
}
|
||||
}
|
||||
@import "@fontsource/jetbrains-mono/100.css";
|
||||
@import "@fontsource/jetbrains-mono/100-italic.css";
|
||||
@import "@fontsource/jetbrains-mono/200.css";
|
||||
@import "@fontsource/jetbrains-mono/200-italic.css";
|
||||
@import "@fontsource/jetbrains-mono/300.css";
|
||||
@import "@fontsource/jetbrains-mono/300-italic.css";
|
||||
@import "@fontsource/jetbrains-mono/400.css";
|
||||
@import "@fontsource/jetbrains-mono/400-italic.css";
|
||||
@import "@fontsource/jetbrains-mono/500.css";
|
||||
@import "@fontsource/jetbrains-mono/500-italic.css";
|
||||
@import "@fontsource/jetbrains-mono/600.css";
|
||||
@import "@fontsource/jetbrains-mono/600-italic.css";
|
||||
@import "@fontsource/jetbrains-mono/700.css";
|
||||
@import "@fontsource/jetbrains-mono/700-italic.css";
|
||||
@import "@fontsource/jetbrains-mono/800.css";
|
||||
@import "@fontsource/jetbrains-mono/800-italic.css";
|
||||
@import "pretendard/dist/web/static/pretendard-dynamic-subset.css";
|
||||
@import "pretendard-jp/dist/web/static/pretendard-jp-dynamic-subset.css";
|
||||
|
||||
@include font(
|
||||
'Pretendard JP',
|
||||
400,
|
||||
normal,
|
||||
'Pretendard JP Regular',
|
||||
'https://cdn.jsdelivr.net/gh/orioncactus/pretendard/packages/pretendard-jp/dist/web/static/woff2/PretendardJP-Regular.woff2'
|
||||
);
|
||||
@include font(
|
||||
'Pretendard JP',
|
||||
700,
|
||||
normal,
|
||||
'Pretendard JP Bold',
|
||||
'https://cdn.jsdelivr.net/gh/orioncactus/pretendard/packages/pretendard-jp/dist/web/static/woff2/PretendardJP-Bold.woff2'
|
||||
);
|
||||
@include font(
|
||||
'JetBrains Mono',
|
||||
400,
|
||||
normal,
|
||||
'JetBrains Mono Regular',
|
||||
'https://cdn.jsdelivr.net/gh/JetBrains/JetBrainsMono@master/fonts/webfonts/JetBrainsMono-Regular.woff2'
|
||||
);
|
||||
@include font(
|
||||
'JetBrains Mono',
|
||||
700,
|
||||
normal,
|
||||
'JetBrains Mono Bold',
|
||||
'https://cdn.jsdelivr.net/gh/JetBrains/JetBrainsMono@master/fonts/webfonts/JetBrainsMono-Bold.woff2'
|
||||
);
|
||||
$default-font: "Pretendard JP", Pretendard, -apple-system, BlinkMacSystemFont, system-ui, Roboto, "Helvetica Neue", "Segoe UI", "Hiragino Sans", "Apple SD Gothic Neo", Meiryo, "Noto Sans JP", "Noto Sans KR", "Malgun Gothic", Osaka, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", sans-serif;
|
||||
$system-font: -apple-system, BlinkMacSystemFont, "Apple SD Gothic Neo", Roboto, "Noto Sans KR", "Segoe UI", "Malgun Gothic", "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", sans-serif;
|
||||
$monospace-font: "JetBrains Mono", "Pretendard JP", Pretendard, Fira code, Fira Mono, Consolas, Menlo, Courier, monospace !important;
|
||||
|
||||
:root {
|
||||
--radius: 12px;
|
||||
@ -80,10 +64,7 @@ html {
|
||||
accent-color: var(--accent);
|
||||
overflow: auto;
|
||||
overflow-wrap: break-word;
|
||||
font-family: "Pretendard JP", Pretendard, -apple-system, BlinkMacSystemFont, system-ui,
|
||||
Roboto, "Helvetica Neue", "Segoe UI", "Hiragino Sans", "Apple SD Gothic Neo",
|
||||
Meiryo, "Noto Sans JP", "Noto Sans KR", "Malgun Gothic", Osaka,
|
||||
"Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", sans-serif;
|
||||
font-family: $default-font;
|
||||
// incoming changes from v13
|
||||
// font-family: 'Hiragino Maru Gothic Pro', "BIZ UDGothic", Roboto, HelveticaNeue, Arial, sans-serif;
|
||||
font-size: 14px;
|
||||
@ -199,7 +180,7 @@ html {
|
||||
}
|
||||
|
||||
&.useSystemFont {
|
||||
font-family: system-ui;
|
||||
font-family: $system-font;
|
||||
}
|
||||
}
|
||||
|
||||
@ -515,12 +496,12 @@ hr {
|
||||
}
|
||||
|
||||
._monospace {
|
||||
font-family: "Pretendard JP", "JetBrains Mono", Fira code, Fira Mono, Consolas, Menlo, Courier, monospace !important;
|
||||
font-family: $monospace-font
|
||||
}
|
||||
|
||||
code[class*="language-"],
|
||||
pre[class*="language-"] {
|
||||
font-family: "JetBrains Mono", "Pretendard JP" , Consolas, Monaco, 'Andale Mono', 'Ubuntu Mono', monospace !important;
|
||||
font-family: $monospace-font
|
||||
}
|
||||
|
||||
.prism-editor__textarea:focus {
|
||||
|
||||
Loading…
Reference in New Issue
Block a user