Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wiki-js
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
1
Issues
1
List
Board
Labels
Milestones
Merge Requests
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
wiki-js
Commits
532e5c99
Unverified
Commit
532e5c99
authored
Apr 10, 2023
by
NGPixel
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: esm changes
parent
8f944494
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
6 additions
and
5 deletions
+6
-5
scheduler.mjs
server/core/scheduler.mjs
+2
-2
system.mjs
server/graph/resolvers/system.mjs
+1
-1
user.mjs
server/graph/resolvers/user.mjs
+1
-0
users.mjs
server/models/users.mjs
+1
-1
ext.mjs
server/modules/extensions/sharp/ext.mjs
+1
-1
No files found.
server/core/scheduler.mjs
View file @
532e5c99
...
...
@@ -6,7 +6,7 @@ import cronparser from 'cron-parser'
import
{
DateTime
}
from
'luxon'
import
{
v4
as
uuid
}
from
'uuid'
import
{
createDeferred
}
from
'../helpers/common.mjs'
import
{
find
,
remove
}
from
'lodash-es'
import
{
camelCase
,
find
,
remove
}
from
'lodash-es'
export
default
{
workerPool
:
null
,
...
...
@@ -27,7 +27,7 @@ export default {
})
this
.
tasks
=
{}
for
(
const
f
of
(
await
fs
.
readdir
(
path
.
join
(
WIKI
.
SERVERPATH
,
'tasks/simple'
))))
{
const
taskName
=
f
.
replace
(
'.mjs'
,
''
)
const
taskName
=
camelCase
(
f
.
replace
(
'.mjs'
,
''
)
)
this
.
tasks
[
taskName
]
=
(
await
import
(
path
.
join
(
WIKI
.
SERVERPATH
,
'tasks/simple'
,
f
))).
task
}
return
this
...
...
server/graph/resolvers/system.mjs
View file @
532e5c99
...
...
@@ -2,7 +2,7 @@ import _ from 'lodash-es'
import
util
from
'node:util'
import
getosSync
from
'getos'
import
os
from
'node:os'
import
filesize
from
'filesize'
import
{
filesize
}
from
'filesize'
import
path
from
'node:path'
import
fs
from
'fs-extra'
import
{
DateTime
}
from
'luxon'
...
...
server/graph/resolvers/user.mjs
View file @
532e5c99
...
...
@@ -122,6 +122,7 @@ export default {
},
async
updateUser
(
obj
,
args
)
{
try
{
console
.
info
(
args
.
id
)
await
WIKI
.
db
.
users
.
updateUser
(
args
.
id
,
args
.
patch
)
return
{
...
...
server/models/users.mjs
View file @
532e5c99
...
...
@@ -642,7 +642,7 @@ export class User extends Model {
*
* @param {Object} param0 User ID and fields to update
*/
static
async
updateUser
(
{
id
,
email
,
name
,
newPassword
,
groups
,
location
,
jobTitle
,
timezone
,
dateFormat
,
appearance
})
{
static
async
updateUser
(
id
,
{
email
,
name
,
newPassword
,
groups
,
location
,
jobTitle
,
timezone
,
dateFormat
,
appearance
})
{
const
usr
=
await
WIKI
.
db
.
users
.
query
().
findById
(
id
)
if
(
usr
)
{
let
usrData
=
{}
...
...
server/modules/extensions/sharp/ext.mjs
View file @
532e5c99
...
...
@@ -56,7 +56,7 @@ export default {
background
=
{
r
:
0
,
g
:
0
,
b
:
0
,
alpha
:
0
},
kernel
=
'lanczos3'
})
{
this
.
load
()
await
this
.
load
()
if
(
inputPath
)
{
inputStream
=
fse
.
createReadStream
(
inputPath
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment