This commit is contained in:
Henry Jameson 2026-08-04 00:56:04 +03:00
commit 2e039561c9
7 changed files with 18 additions and 26 deletions

View file

@ -1,7 +1,7 @@
import fs from 'node:fs'
import emojis from '@kazvmoe-infra/unicode-emoji-json/data-by-group.json' with { import emojis from '@kazvmoe-infra/unicode-emoji-json/data-by-group.json' with {
type: 'json', type: 'json',
} }
import fs from 'node:fs'
Object.keys(emojis).map((k) => { Object.keys(emojis).map((k) => {
emojis[k].forEach((e) => { emojis[k].forEach((e) => {

View file

@ -109,7 +109,9 @@ export const promisedRequest = async ({
.get('content-type') .get('content-type')
.split(';') .split(';')
.map((x) => x.toLowerCase().trim()) .map((x) => x.toLowerCase().trim())
const contentLength = Number.parseInt(response.headers.get('content-length')) const contentLength = Number.parseInt(
response.headers.get('content-length'),
)
if (contentLength === 0) return null if (contentLength === 0) return null
switch (contentType) { switch (contentType) {

View file

@ -420,8 +420,7 @@ const getNodeInfo = async ({ store }) => {
}) })
useInstanceStore().set({ useInstanceStore().set({
path: 'federating', path: 'federating',
value: value: federation.enabled === undefined ? true : federation.enabled,
federation.enabled === undefined ? true : federation.enabled,
}) })
const accountActivationRequired = metadata.accountActivationRequired const accountActivationRequired = metadata.accountActivationRequired
@ -548,9 +547,7 @@ const afterStoreSetup = async ({ pinia, store, storageError, i18n }) => {
const overrides = window.___pleromafe_dev_overrides || {} const overrides = window.___pleromafe_dev_overrides || {}
const server = const server =
overrides.target !== undefined overrides.target !== undefined ? overrides.target : window.location.origin
? overrides.target
: window.location.origin
useInstanceStore().set({ path: 'server', value: server }) useInstanceStore().set({ path: 'server', value: server })
await setConfig({ store }) await setConfig({ store })

View file

@ -75,7 +75,7 @@ export default {
logoBgStyle() { logoBgStyle() {
const mask = this.enableMask const mask = this.enableMask
? {} ? {}
: {'background-color': this.enableMask ? '' : 'transparent'} : { 'background-color': this.enableMask ? '' : 'transparent' }
return { return {
margin: `${this.logoMargin} 0`, margin: `${this.logoMargin} 0`,

View file

@ -633,17 +633,11 @@ export default {
if (version === 0) { if (version === 0) {
if (input.version) version = input.version if (input.version) version = input.version
// Old v1 naming: fg is text, btn is foreground // Old v1 naming: fg is text, btn is foreground
if ( if (colors.text === undefined && colors.fg !== undefined) {
colors.text === undefined &&
colors.fg !== undefined
) {
version = 1 version = 1
} }
// New v2 naming: text is text, fg is foreground // New v2 naming: text is text, fg is foreground
if ( if (colors.text !== undefined && colors.fg !== undefined) {
colors.text !== undefined &&
colors.fg !== undefined
) {
version = 2 version = 2
} }
} }

View file

@ -125,10 +125,7 @@ const generateTheme = (inputRuleset, callbacks, debug) => {
const processChunk = () => { const processChunk = () => {
const chunk = chunks[counter] const chunk = chunks[counter]
Promise.all(chunk.map((x) => x())).then((result) => { Promise.all(chunk.map((x) => x())).then((result) => {
getCssRules( getCssRules(result.filter(Boolean), debug).forEach((rule) => {
result.filter(Boolean),
debug,
).forEach((rule) => {
onNewRule(rule, true) onNewRule(rule, true)
}) })
// const t1 = performance.now() // const t1 = performance.now()
@ -253,7 +250,9 @@ const extractStyleConfig = ({
contentColumnWidth, contentColumnWidth,
notifsColumnWidth, notifsColumnWidth,
themeEditorMinWidth: themeEditorMinWidth:
Number.parseInt(themeEditorMinWidth) === 0 ? 'fit-content' : themeEditorMinWidth, Number.parseInt(themeEditorMinWidth) === 0
? 'fit-content'
: themeEditorMinWidth,
emojiReactionsScale, emojiReactionsScale,
emojiSize, emojiSize,
navbarSize, navbarSize,