dakkar
f00576bce6
Merge remote-tracking branch 'misskey/master' into feature/2024.9.0
2024-10-09 15:17:22 +01:00
syuilo
0b062f1407
Misskey® Reactions Buffering Technology™ ( #14579 )
...
* wip
* wip
* Update ReactionsBufferingService.ts
* Update ReactionsBufferingService.ts
* wip
* wip
* wip
* Update ReactionsBufferingService.ts
* wip
* wip
* wip
* Update NoteEntityService.ts
* wip
* wip
* wip
* wip
* Update CHANGELOG.md
2024-09-20 21:03:53 +09:00
かっこかり
2cbe1d1210
feat(frontend): ノート・ユーザータイムライン埋め込み ( #13929 )
...
* fix
* navhookをbootに移動
* サーバーサイドのbootも分けるように
* 埋め込みページかどうかの判定は最初の一回だけに
* tooltipは出せるように
* fix design
* 埋め込み独自のtooltipを削除
* ロジックの分岐が多かったMkNoteDetailedを分離
* fix indent
* プレビュー用iframeにフォーカスが当たるのを修正
* popupの制御を出す側で行うように
* パラメータが逆になっていたのを修正
* Update MkEmbedCodeGenDialog.vue
* fix
* eliminate misskey-js lint warns
* fix
* add appropriate attributes to embed html
* enhance: サーバーサイドのembed系をさらに分離
* enhance: embed routerを分離（route定義をboot時に変更できるようにする改修を含む）
* type
* lint
* fix indent
* server-side styleを完全に分離
* Revert "refactor: 画面サイズのしきい値をconstにまとめる"
This reverts commit 05ca36f400889456981e89489ae0ae242fa09b67.
* fix
* revert all changes in base.pug
* embedドメインをまとめた
* embedドメインをまとめた
* prevent calling contextmenu in embed page by stopping at the caller
* fix import
* fix import
* improve directory structure
* fix import
* register timeline ui as a container
* wa-
* rename
* wa-
* Update EmMediaList.vue
* Update EmMediaList.vue
* Update EmMediaList.vue
* Update EmMediaImage.vue
* Update EmNote.vue
* revert mkmedialist changes
* 戻し漏れ
* wip
* tweak embed media ui
* revert original media components
* Update boot.embed.js
* rename
* wip
* Update MkNote.vue
* wip
* Update MkSubNoteContent.vue
* Update EmNote.vue
* Update packages/frontend/src/router/definition.ts
* Revert "Update packages/frontend/src/router/definition.ts"
This reverts commit 937ae44521cdb0f250796943b20142b65f8ed944.
* refactor EmMediaImage
* fix import
* remove unused imports
* Update router.ts
* wip
* Update boot.ts
* wip
* wip
* wip
* wip
* Update EmNote.vue
* Update EmNote.vue
* Create EmA.vue
* Create EmAvatar.vue
* Update EmAvatar.vue
* wip
* wip
* wip
* Create EmImgWithBlurhash.vue
* Update EmImgWithBlurhash.vue
* Create EmPagination.vue
* wip
* Update boot.ts
* wip
* wip
* wi@p
* wip
* wip
* wiop
* wip
* wip
* wip
* wip
* wip
* wip
* wip
* wip
* wip
* wip
* Update boot.ts
* wip
* Update MkMisskeyFlavoredMarkdown.ts
* wip
* wip
* wip
* wip
* wip
* Update post-message.ts
* wip
* Update EmNoteDetailed.vue
* Update EmNoteDetailed.vue
* Create instance.ts
* Update EmNoteDetailed.vue
* wip
* Update EmNoteDetailed.vue
* wip
* wip
* wip
* Update pnpm-lock.yaml
* wip
* wip
* wp
* wip
* Update ClientServerService.ts
* wip
* Update boot.ts
* Update vite.config.local-dev.ts
* Update vite.config.ts
* Create index.html
* wa-
* wip
* Update boot.ts
* wip
* wip
* wip
* wip
* wip
* wip
* wip
* wip
* wip
* Create EmLink.vue
* Create EmMention.vue
* Update EmMfm.ts
* wip
* wip
* wip
* wip
* Update vite.config.ts
* Update boot.ts
* Update EmA.vue
* うぃｐ
* wip
* wip
* Create EmError.vue
* wip
* Update MkEmbedCodeGenDialog.vue
* Update EmNote.vue
* wip
* wip
* Update user-timeline.vue
* Update check-spdx-license-id.yml
* wip
* wip
* style(frontend-shared): lint fixes on build.js
* fix(frontend-shared): include `*.{js,json}` files in js-built
* wip
* use alias
* refactor
* refactor
* Update scroll.ts
* refactor
* refactor
* refactor
* wip
* wip
* wip
* wip
* Update roles.vue
* Update branding.vue
* wip
* wip
* wip
* Update page.vue
* wip
* fix import
* add missing css variables
* 絵文字をtwemojiに変更
クライアントデフォルトにあわせるため
* force empoll readonly
* fix compiler error
* fix broken imports
* tweak button style
* run api extractor
* fix storybook theme preloads
* fix storybook instance imports
* Update preview.ts
* Update preview.ts
* Update preview.ts
* Revert "Update preview.ts"
This reverts commit 12bab1c6fbd3baf753515df760ff19d027b85155.
* Revert "Update preview.ts"
This reverts commit 5c0ce01dbdf2194ffe94aba950f747a9968f29c4.
* Revert "Update preview.ts"
This reverts commit f4863524d7e5ca0f25470808849c24a72bea000a.
* Revert "fix storybook instance imports"
This reverts commit ed8eabb246edf731d31adffbe3c77c539e53ae9e.
* Revert "wip"
This reverts commit d3c1926519878155193a1654f49141e515d49683.
* Revert "Update page.vue"
This reverts commit 27c7900b0c1ae296b56075e8a9c22585d9cd744b.
* Revert "Update branding.vue"
This reverts commit c08ccb65ba66774c3e2b3dcfc6153004b5c0aa16.
* Revert "Update roles.vue"
This reverts commit 1488b670660cb1803d17d8f5c78f2d79e59fa52d.
* Revert "wip"
This reverts commit aab1c769814b08c257cad3025422a0eea3bfba4f.
* refactor: use common media proxy
* fix imports
* fix
* fix: MediaProxyの初期化を保証する（storybook対策？）
* enhance(frontend-embed): improve embedParams provide
* fix(backend): MK_DEV_PREFER=backendのときにembed viteが読み込めないのを修正
* fix
* embed-pageを共通化
* fix import
* fix import
* fix import
* const.jsを共通化
（たぶんrevertしすぎた）
* fix type error
* fix duplicated import
* fix lint
* fix
* コメントとして残す
* sharedとembedをlint対象にする
* lint
* attempt to fix eslint (frontend-shared)
* lint fixes
---------
Co-authored-by: syuilo <4439005+syuilo@users.noreply.github.com>
Co-authored-by: zyoshoka <107108195+zyoshoka@users.noreply.github.com>
2024-09-09 20:57:36 +09:00
syuilo
8032a4e12a
enhance(frontend): サイズ制限を超過するファイルをアップロードしようとした際にエラーを出すように
2024-08-23 16:40:11 +09:00
dakkar
94dceb9e15
Merge branch 'develop' into feature/misskey-2024.07
2024-08-06 17:51:51 +01:00
dakkar
f85e8a4278
appease the linter
2024-08-06 11:42:03 +01:00
dakkar
9de422280f
merge: feat: implement attachLdSignatureForRelays to control signing of Relayed activities ( #599 ) ( !579 )
...
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/579
Closes #599
Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Marie <marie@kaifa.ch>
2024-08-06 10:40:14 +00:00
dakkar
cb5de3fbfc
fix type for env variable
2024-08-06 11:24:43 +01:00
dakkar
34c1e9ea2b
Merge branch 'develop' into feature/misskey-2024.07
...
fixing conflicts in `package.json`
2024-08-06 10:35:14 +01:00
dakkar
76a966041f
merge: Fall back to port 3000 if none is specified ( !584 )
...
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/584
Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: fEmber <acomputerdog@gmail.com>
2024-08-06 09:23:08 +00:00
4censord
e1b0faa18f
Fall back to port 3000 if none is specified
...
Originally, because `parseInt` can return `NaN`, sharkey would happily
try to listen on port `NaN`.
2024-08-03 17:43:02 +02:00
4censord
12aeaa5f95
Complain if no config-files are loaded
2024-08-03 17:42:59 +02:00
dakkar
955fda6e1c
also allow db.disableCache
2024-08-03 15:29:09 +01:00
dakkar
16601fa766
allow overriding more config settings via env vars
...
`id` in particular is necessary if one wants to do a working basic
configuration without a config file at all, thanks to @4censord for
making me notice
2024-08-03 14:56:29 +01:00
dakkar
cfa9b852df
Merge remote-tracking branch 'misskey/master' into feature/misskey-2024.07
2024-08-02 12:25:58 +01:00
Hazel K
916509dd6a
revert more import changes
2024-07-26 10:17:02 -04:00
Hazel K
32872181dd
feat: implement attachLdSignatureForRelays to control signing of Relayed activities
2024-07-25 10:37:23 -04:00
dakkar
6e1e3bc0ea
pass redis config as-is to postgres cache
...
also, explicitly state that `path` is a valid config option for
redis (tells `ioredis` to connect via UNIX socked instead of TCP
socket)
2024-07-21 11:02:46 +01:00
Souma
1b84760c19
enhance(backend): Load settings via environment variables ( #14179 )
...
* feat(backend): Load settings via environment variables
If they're not loaded from the config file.
* chore(docker): Add hints for environment variables
It supports users to know about them.
* docs(changelog): Add the description about this change
Users can notice what's changed by this PR.
* style(backend): Fix code syntax
To pass the linter.
2024-07-14 21:33:22 +09:00
syuilo
c5607d8633
enhance(backend): configにsignToActivityPubGetの指定が無い場合trueと見做すように
...
trueの方が望ましいため
2024-07-14 20:14:43 +09:00
dakkar
5dc8c2827c
Merge branch 'develop' into future-2024-05-31
2024-06-08 16:45:53 +01:00
Amelia Yukii
23b1c29a0b
merge: allow setting separate timeout / max size for imports - fixes #479 ( !519 )
...
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/519
Closes #479
Approved-by: Marie <marie@kaifa.ch>
Approved-by: Amelia Yukii <amelia.yukii@shourai.de>
2024-06-03 16:29:19 +00:00
dakkar
082e1d1afb
allow setting separate timeout / max size for imports - fixes #479
2024-06-03 16:29:19 +00:00
dakkar
43d15506aa
add sentry options to env overrides
2024-05-31 13:10:02 +01:00
dakkar
e045652c80
lint config.ts
2024-05-31 13:00:59 +01:00
dakkar
3372e0ffe1
Merge remote-tracking branch 'misskey/release/2024.5.0' into future
2024-05-31 12:26:07 +01:00
dakkar
38d98e5048
nicer type for alwaysStrings, thanks Marie
2024-05-30 11:29:31 +01:00
syuilo
80f3cb96b0
feat: sentry integration ( #13897 )
...
* wip
* wip
* wip
* wip
* Update CHANGELOG.md
* Update ApiCallService.ts
* Update config.ts
2024-05-28 17:06:33 +09:00
dakkar
aa7271469e
fix types in config.ts
...
my recent changes to allow overrides from the environment had bad types
2024-05-18 15:56:21 +01:00
dakkar
4271402e0d
recognise numbers and boolean values
2024-03-24 11:17:55 +00:00
dakkar
0e8cdb30b7
allow setting values not present in the config file
...
replicas and arrays in general, are more complicated :/
2024-03-24 11:12:17 +00:00
dakkar
435cab01c8
deal with (possible, future) non-alnum config keys
2024-03-21 10:00:16 +00:00
dakkar
25e6409cc9
allow overriding all string config values via env - fixes #465
...
will need end-user documentation!
2024-03-20 15:38:20 +00:00
Marie
10bfc61670
merge: upstream
2024-02-19 10:47:42 +01:00
Acid Chicken (硫酸鶏)
acba96c1d3
feat: license violation protection ( #13285 )
...
* spec(frontend): aboutページにリポジトリ・フィードバックのURLを表示させる
Cherry-picked from MisskeyIO#441
Cherry-picked from MisskeyIO#438
* feat: license violation protection
* build: fix typo
* build: fix typo
* fix: farewell to the static type land
* fix: key typo
* fix: import typo
* fix: properly interpret `prominently`
* docs: add disclaimer
* docs: update CHANGELOG
* chore: add gap
---------
Co-authored-by: まっちゃとーにゅ <17376330+u1-liquid@users.noreply.github.com>
Co-authored-by: syuilo <4439005+syuilo@users.noreply.github.com>
2024-02-17 13:34:50 +09:00
tamaina
c1514ce91d
(re) update SPDX-FileCopyrightText
...
Fix #13290
2024-02-13 15:59:27 +00:00
tamaina
311c2172d7
Revert "update SPDX-FileCopyrightText"
...
This reverts commit 9b5aeb76d8
2024-02-13 15:50:11 +00:00
syuilo
9b5aeb76d8
update SPDX-FileCopyrightText
2024-02-12 11:37:45 +09:00
Marie
11628e4b6a
merge: upstream
2024-02-03 20:19:44 +01:00
woxtu
cdac3988b5
fix(backend): Fix typos in job configurations ( #13086 )
...
* Fix typos
* Update CHANGELOG
2024-01-28 15:08:45 +09:00
ShittyKopper
de66ecbbd0
fix: actually make signToActivityPubGet default to true
2024-01-13 14:47:55 +03:00
dakkar
8bc77072cb
fix: sort multiple config files
...
`globSync` doesn't guarantee the order in which it returns the
matching paths, so without the `sort()`, the config files may be
merged differently each time the server is started
2023-12-31 18:44:53 +00:00
Marie
b1c26201ca
upd: Note Length customization
...
note length is now configurable through the config file
Closes #281
falls back to 3000 (misskey default) if not used/included in config
2023-12-31 18:22:02 +01:00
trivernis
93094bcb72
Keep only the changes to loading the config files using glob patterns
2023-12-27 16:35:14 +01:00
trivernis
df7f4aa3ec
Add support for glob syntax to config file env variables
...
This change allows loading config files using glob syntax, for
exakple `production-*.yml` to load all config files prefixed with
*production*. With this change the config file can also be configured
using two additional env variables `SHARKEY_CONFIG_YML`
and `SHARKEY_CONFIG_FILE`.
2023-12-27 16:08:37 +01:00
trivernis
64d34f595c
Change loadConfig to load all yaml files in the config directory
2023-12-27 14:09:59 +01:00
dakkar
e5ea882ed7
authorized fetch #217
...
the implementation is copied from the other places we already check
HTTP signatures, and cross-checked with Firefish's implementation
2023-12-23 15:26:42 +00:00
Marie
e0155cffae
add: Custom MOTDs
...
This works almost exactly like FF's custom MOTDs with the only difference being that they get defined in the config file for performance reasons.
Closes #86
2023-12-22 13:10:21 +01:00
syuilo
e632a84431
tweak default configuration
2023-11-01 14:00:31 +09:00
syuilo
6277a5545c
feat: improve tl performance ( #11946 )
...
* wip
* wip
* wip
* wip
* wip
* wip
* Update NoteCreateService.ts
* wip
* wip
* wip
* wip
* Update NoteCreateService.ts
* wip
* Update NoteCreateService.ts
* wip
* Update user-notes.ts
* wip
* wip
* wip
* Update NoteCreateService.ts
* wip
* Update timeline.ts
* Update timeline.ts
* Update timeline.ts
* Update timeline.ts
* Update timeline.ts
* wip
* Update timelines.ts
* Update timelines.ts
* Update timelines.ts
* wip
* wip
* wip
* Update timelines.ts
* Update misskey-js.api.md
* Update timelines.ts
* Update timelines.ts
* wip
* wip
* wip
* Update timelines.ts
* wip
* Update timelines.ts
* wip
* test
* Update activitypub.ts
* refactor: UserListJoining -> UserListMembership
* Update NoteCreateService.ts
* wip
2023-10-03 20:26:11 +09:00
