diff options
author | Chocobozzz <me@florianbigard.com> | 2023-07-31 14:34:36 +0200 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2023-08-11 15:02:33 +0200 |
commit | 3a4992633ee62d5edfbb484d9c6bcb3cf158489d (patch) | |
tree | e4510b39bdac9c318fdb4b47018d08f15368b8f0 /server/lib/search.ts | |
parent | 04d1da5621d25d59bd5fa1543b725c497bf5d9a8 (diff) | |
download | PeerTube-3a4992633ee62d5edfbb484d9c6bcb3cf158489d.tar.gz PeerTube-3a4992633ee62d5edfbb484d9c6bcb3cf158489d.tar.zst PeerTube-3a4992633ee62d5edfbb484d9c6bcb3cf158489d.zip |
Migrate server to ESM
Sorry for the very big commit that may lead to git log issues and merge
conflicts, but it's a major step forward:
* Server can be faster at startup because imports() are async and we can
easily lazy import big modules
* Angular doesn't seem to support ES import (with .js extension), so we
had to correctly organize peertube into a monorepo:
* Use yarn workspace feature
* Use typescript reference projects for dependencies
* Shared projects have been moved into "packages", each one is now a
node module (with a dedicated package.json/tsconfig.json)
* server/tools have been moved into apps/ and is now a dedicated app
bundled and published on NPM so users don't have to build peertube
cli tools manually
* server/tests have been moved into packages/ so we don't compile
them every time we want to run the server
* Use isolatedModule option:
* Had to move from const enum to const
(https://www.typescriptlang.org/docs/handbook/enums.html#objects-vs-enums)
* Had to explictely specify "type" imports when used in decorators
* Prefer tsx (that uses esbuild under the hood) instead of ts-node to
load typescript files (tests with mocha or scripts):
* To reduce test complexity as esbuild doesn't support decorator
metadata, we only test server files that do not import server
models
* We still build tests files into js files for a faster CI
* Remove unmaintained peertube CLI import script
* Removed some barrels to speed up execution (less imports)
Diffstat (limited to 'server/lib/search.ts')
-rw-r--r-- | server/lib/search.ts | 49 |
1 files changed, 0 insertions, 49 deletions
diff --git a/server/lib/search.ts b/server/lib/search.ts deleted file mode 100644 index b3363fbec..000000000 --- a/server/lib/search.ts +++ /dev/null | |||
@@ -1,49 +0,0 @@ | |||
1 | import express from 'express' | ||
2 | import { CONFIG } from '@server/initializers/config' | ||
3 | import { AccountBlocklistModel } from '@server/models/account/account-blocklist' | ||
4 | import { getServerActor } from '@server/models/application/application' | ||
5 | import { ServerBlocklistModel } from '@server/models/server/server-blocklist' | ||
6 | import { SearchTargetQuery } from '@shared/models' | ||
7 | |||
8 | function isSearchIndexSearch (query: SearchTargetQuery) { | ||
9 | if (query.searchTarget === 'search-index') return true | ||
10 | |||
11 | const searchIndexConfig = CONFIG.SEARCH.SEARCH_INDEX | ||
12 | |||
13 | if (searchIndexConfig.ENABLED !== true) return false | ||
14 | |||
15 | if (searchIndexConfig.IS_DEFAULT_SEARCH && !query.searchTarget) return true | ||
16 | |||
17 | return false | ||
18 | } | ||
19 | |||
20 | async function buildMutedForSearchIndex (res: express.Response) { | ||
21 | const serverActor = await getServerActor() | ||
22 | const accountIds = [ serverActor.Account.id ] | ||
23 | |||
24 | if (res.locals.oauth) { | ||
25 | accountIds.push(res.locals.oauth.token.User.Account.id) | ||
26 | } | ||
27 | |||
28 | const [ blockedHosts, blockedAccounts ] = await Promise.all([ | ||
29 | ServerBlocklistModel.listHostsBlockedBy(accountIds), | ||
30 | AccountBlocklistModel.listHandlesBlockedBy(accountIds) | ||
31 | ]) | ||
32 | |||
33 | return { | ||
34 | blockedHosts, | ||
35 | blockedAccounts | ||
36 | } | ||
37 | } | ||
38 | |||
39 | function isURISearch (search: string) { | ||
40 | if (!search) return false | ||
41 | |||
42 | return search.startsWith('http://') || search.startsWith('https://') | ||
43 | } | ||
44 | |||
45 | export { | ||
46 | isSearchIndexSearch, | ||
47 | buildMutedForSearchIndex, | ||
48 | isURISearch | ||
49 | } | ||