OpenSource/Sharkey
OpenSource/Sharkey
1
0
Fork 0
mirror of https://activitypub.software/TransFem-org/Sharkey.git synced 2024-12-14 01:50:45 +01:00
Code Issues Projects Releases Packages Wiki Activity
25863 commits 56 branches 924 tags 271 MiB
Commit graph

2052 commits

Author SHA1 Message Date
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
8b31c12607 Merge branch 'develop' into feature/config-dropdir 2023-12-27 14:11:42 +01:00
trivernis
64d34f595c
Change loadConfig to load all yaml files in the config directory 2023-12-27 14:09:59 +01:00
Marie
5bc036180f upd: module versions 2023-12-25 21:37:13 +01:00
Marie
fd57c7e24c merge: authorized fetch (#247) 
Closes #217
 2023-12-24 10:02:53 +01:00
dakkar
a3dd61dec4 fix logging 2023-12-23 21:27:48 +00:00
dakkar
e6c02909c7 fix typo 
thanks @Marie
 2023-12-23 20:11:53 +00:00
Marie
53365159e8 merge: real-time updates on note detail view (#246) 
Closes #223

Reviewed-on: https://git.joinsharkey.org/Sharkey/Sharkey/pulls/246
Reviewed-by: Marie <marie@kaifa.ch>
 2023-12-23 21:00:00 +01:00
dakkar
477cda0b63 authorized fetch: log when things go wrong 2023-12-23 15:26:42 +00:00
dakkar
1984416e3e authorized fetch: let /@instance.actor through 
this is probably never actually used, but it still looks like a good
idea (also, FireFish does it)

thanks @ShittyKoper for noticing!
 2023-12-23 15:26:42 +00: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
6526968f2d fix: check 2023-12-23 16:08:04 +01:00
dakkar
683b4aafb2 real-time updates on note detail view 
`useNoteCapture` already subscribes to all updates for a note, so
we can tell it when a note gets replied to, too

Since I'm not actually adding any extra subscription in the client,
just an extra callback, there should be no overhead when replies are
not coming in.

Also, all the timelines already call `useNoteCapture` for each note
displayed, so we know the whole `GlobalEventService` thing works fine.

Many thanks to VueJS for taking care of all the DOM complications
 2023-12-23 14:09:51 +00:00
Marie
b3b89567ee merge: upstream 2023-12-23 14:26:24 +01:00
anatawa12
2f425aa03f
fix: ブロックされててもpure RNできる (#12758) 
なぜかわからないけど元々Quoteはできるようなのでそれに戻しました
 2023-12-23 17:55:34 +09:00
syuilo
e852f4b60d Revert "fix(backend): renote判定がおかしい" 
This reverts commit f43599552f.
 2023-12-23 17:55:27 +09:00
syuilo
f43599552f fix(backend): renote判定がおかしい 2023-12-23 17:54:29 +09:00
syuilo
6e4894c165 lint 2023-12-23 14:39:01 +09:00
GrapeApple0
5b5a537f56
feat: 登録を拒否するメールアドレスのドメインを手動で設定できるように (#12740) 
* feat: 使い捨てアドレスのドメインを手動で設定できるように

* Update CHANGELOG.md

* disposableEmailDomains -> bannedEmailDomains

* isBlockedHostを使うように
 2023-12-23 12:06:22 +09:00
Nya Candy
b3c4f7eddc
fix: email verify enable logic (#12743) 2023-12-23 11:00:14 +09:00
Marie
220344c552 fix: email validation 2023-12-23 02:15:12 +01:00
Marie
5db583a3eb merge: upstream 2023-12-23 02:09:23 +01: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
anatawa12
52b94dbc4a
fix: 引用RNがpure RNとして連合され、pure RNが引用RNとして連合される (#12744) 
* fix: quote notes are rendered as pure renote

* fix: filesが指定されてて空配列のときにQuote扱いされる

* chore: isQuoteの仕様をmisc/is-quote.tsと揃える

* docs: is-quote.tsの方にNoteCreateService.isQuoteのことを書いて更新忘れを防ぐ
 2023-12-22 14:03:39 +09:00
おさむのひと
433d46e57f
fix(backend): テストが死んでいるのを修正 (#12738) 
* fix test

* fix test

* fix test

* fix test

* fix test
 2023-12-22 09:06:13 +09:00
Marie
043f26c895 upd: improve performance for checking if instance is marked as NSFW on images 2023-12-21 23:15:49 +01:00
Marie
4ca3c05487 upd: make new posts be marked as NSFW if instance is marked as NSFW 
Closes #226
 2023-12-21 23:15:03 +01:00
Marie
9c6a7aed98 fix: websocket for timelines not checking following for muted instance users 
Closes #233
 2023-12-21 22:42:06 +01:00
Marie
90f8d8e575 upd: fix tag view not respecting blocks and suspensions 
Closes #234
 2023-12-21 22:24:23 +01:00
GrapeApple0
79ca93cefb
enhance: api.jsonのレスポンスの内容を実際の内容に合わせる (#12723) 
* Create packedAdSchema

* admin/emoji/add

* admin/get-user-ips

* admin/roles/users

* admin/get-index-stats

* admin/accounts/find-by-email

* fix type of admin/ad/list

* federation/stats

* endpoints

* get-online-users-count

* i/2fa/register-key

* i/2fa/key-done

* i/2fa/register

* i/apps

* i/authorized-apps

* i/registry/get-all

* i/registry/get

* i/registry/get-detail

* i/registry/key-with-type

* i/registry/scopes-with-domain

* i/update-email

* i/move

* i/webhooks/create

* fix miss type

* i/webhooks/show

* i/webhooks/list

* flash/create

* roles/users

* server-info

* test

* users/lists/get-memberships

* users/achievements

* fetch-rss

* fetch-external-resources
 2023-12-21 16:57:05 +09:00
anatawa12
b2254a66d3
chore: remove hashtag from featured immediately (#12668) 
* chore: remove hashtag from featured immediately

* docs(changelog): ハッシュタグのトレンド除外設定が即時に効果を持つように修正

---------

Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
 2023-12-21 11:34:19 +09:00
syuilo
b3ab96b5ee fix(backend): ロールアサインの通知がある状態でページをリロードすると通知欄に何もでなくなる 
Fix #12729
 2023-12-21 11:23:31 +09:00
syuilo
15b0d2aff2
enhance: ロールにアサインされたときの通知 (#12607) 
* wip

* Update misskey-js.api.md

* Update CHANGELOG.md

* Update RoleService.ts

* Update locales/ja-JP.yml

Co-authored-by: かっこかり <67428053+kakkokari-gtyih@users.noreply.github.com>

* Update UserListService.ts

* Update misskey-js.api.md

* fix (#12724)

---------

Co-authored-by: かっこかり <67428053+kakkokari-gtyih@users.noreply.github.com>
Co-authored-by: おさむのひと <46447427+samunohito@users.noreply.github.com>
 2023-12-21 10:39:11 +09:00
Kagami Sascha Rosylight
d14eb20122
chore(workflows): use postgres 15 everywhere (#12726) 2023-12-21 10:29:51 +09:00
Kagami Sascha Rosylight
4175b7809b
chore(QueueProcessorService): show error stack for failures (#12727) 2023-12-21 10:29:30 +09:00
Marie
cf3299312a merge: allow themes to specify a font (#230) 
Closes #225
Closes #25
 2023-12-19 11:35:24 +01:00
zawa-ch
4e2d802967
enhance: “つながりの公開範囲”がフォロー・フォロワー個別設定できるように (#12702) 
* Enhance: “つながりの公開範囲”がフォロー・フォロワー個別設定できるように (#12072)

* refactor: crowdin 編集部分のコミットを打ち消し

https://github.com/misskey-dev/misskey/pull/12702#issuecomment-1859417158

* refactor: オブジェクトの名前修正

https://github.com/misskey-dev/misskey/pull/12702#issuecomment-1859417158

* fix: 設定項目の説明を削除

名称が具体的になって必要なくなったため
https://github.com/misskey-dev/misskey/pull/12702#discussion_r1429932463
 2023-12-18 20:59:20 +09:00
1STEP621
f6ff3b1f1a
Fix: Renoteの判定が間違っているのを修正 (#12706) 
* RNと引用RNの判定が間違っているのを修正

* remove dump.rdb

* update CHANGELOG.md

* lint fix
 2023-12-18 19:49:19 +09:00
zyoshoka
13990279c3
enhance: Unicode 15.0で新たに追加された絵文字をリアクションに使えるように (#12683) 2023-12-18 14:51:29 +09:00
syuilo
507d436699 update mfm-js 2023-12-18 13:22:34 +09:00
syuilo
8a9f4ef441 update deps 2023-12-18 13:14:58 +09:00
syuilo
5150053275 fix(backend): add missing kind definition for admin endpoints to improve security 2023-12-18 12:32:26 +09:00
Marie
c92c2d065f upd: replace mfm with sfm 2023-12-18 03:03:05 +01:00
syuilo
2ecc0299b4 update deps 2023-12-16 14:00:27 +09:00
かっこかり
fda5147d06
fix(dev): ファイルの読み込みに失敗することがあるのを修正 (#12684) 
* (enhance) コード入力をMkCodeEditorに変更

* (fix) devでファイルの読み込みに失敗することがある

* Revert "(enhance) コード入力をMkCodeEditorに変更"

This reverts commit 726d56c3e962680efc5b5a166e2210d09730341f.
 2023-12-16 13:23:25 +09:00
syuilo
9f49b9f4d2 fix(backend): HTTP Digestヘッダのアルゴリズム部分に大文字の"SHA-256"しか使えない 
Fix #12678
 2023-12-16 10:58:44 +09:00
shiosyakeyakini
3e256eee2c
Fix(backend): JSONSchemaに不足しているパラメータを追加 (#12680) 
* Fix(backend): JSONSchemaに不足しているパラメータを追加

* nullable:falseに修正

---------

Co-authored-by: sorairo <sorairo@shiosyakeyakini.info>
 2023-12-16 09:00:32 +09:00
anatawa12
bd4d8694dd
perf: early return users/notes and users/featured-notes if me is blocked by requesting user (#12663) 2023-12-15 11:24:13 +09:00
woxtu
5cc3d3c873
Remove an unnecessary type assertion (#12666) 2023-12-15 11:22:49 +09:00