trivernis
5f2e07d81f
Revert unnecessary changes to backend package.json
2023-12-29 20:05:19 +01:00
Trivernis
5af915e17e
Merge branch 'develop' into feature/config-dropdir
2023-12-29 20:04:22 +01:00
Marie
18e82c0627
fix: frontend not being able to build
2023-12-28 19:37:22 +01:00
Marie
870f70a683
upd: up sfm.js version
2023-12-28 13:06:11 +01:00
Marie
9a9f61a6c0
fix: typecheck
2023-12-28 12:52:12 +01:00
Marie
592027cf68
merge: upstream
2023-12-28 09:54:32 +01:00
Chocolate Pie
530a282524
fix(test): CIが落ちている問題を修正 ( #12816 )
...
* fix(test): CIが落ちているのを修正
* fix(ci)?: CIの`typecheck`が落ちる問題を修正
* fix(ci): コンフィグファイルのタイポを修正
2023-12-28 09:46:46 +01:00
MomentQYC
3f60d7c44b
Add a prompt for Tor Browser users ( #12776 )
...
* perf: Add a prompt for Tor Browser users
* typo
2023-12-28 09:46:46 +01:00
Kagami Sascha Rosylight
544b8106b2
feat(backend/oauth): allow CORS for token endpoint ( #12814 )
...
* feat(backend/oauth): allow CORS for token endpoint
* no need to explicitly set origin to `*`
* Update CHANGELOG.md
2023-12-28 09:46:19 +01:00
Chocolate Pie
82822e29d9
Merge pull request from GHSA-7pxq-6xx9-xpgm
...
* fix: fix improper authorization when accessing with third-party application
* refactor: refactor type definitions
* fix: get rid of unnecessary access limitation
* enhance: サードパーティアプリケーションがWebsocket APIを使えるように
* fix: add missing parentheses
* Revert "fix(backend): add missing kind definition for admin endpoints to improve security"
This reverts commit 5150053275
2023-12-28 09:45:54 +01:00
shiosyakeyakini
790f509ebe
fix(backend): 非センシティブのみ（リモートはいいねのみ）が昨日していない問題を修正 ( #12801 ) ( #12802 )
...
Co-authored-by: sorairo <sorairo@shiosyakeyakini.info>
Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
2023-12-28 09:45:15 +01:00
zyoshoka
8daff4a998
refactor(frontend): Reactivityで型を明示するように ( #12791 )
...
* refactor(frontend): Reactivityで型を明示するように
* fix: プロパティの参照が誤っているのを修正
* fix: 初期化の値を空配列に書き換えていた部分をnullに置き換え
2023-12-28 09:45:15 +01:00
anatawa12
34cdba6c11
fix: 自分のdirect noteがuser list timelineに追加されない ( #12782 )
...
* fix: 自分のdirect noteがuser list timelineに追加されない
* docs(changelog): Fix: 自分のdirect noteがuser list timelineに追加されない
2023-12-28 09:43:12 +01:00
Nya Candy
6f65091cef
fix: lint ( #12761 )
2023-12-28 09:42:47 +01:00
おさむのひと
f743cba26b
fix(backend): 1702718871541-ffVisibility.jsのdownが壊れている ( #12767 )
2023-12-28 09:42:47 +01:00
syuilo
42cc909c5b
enhance(backend): センシティブワードの設定がハッシュタグトレンドにも適用されるように
2023-12-28 09:42:47 +01:00
Marie
1f5256b99c
upd: mute reaction notifications if thread is muted
...
Closes #263
2023-12-27 23:53:37 +01:00
trivernis
06d110a773
Lock glob to exact package version 10.3.10
2023-12-27 21:02:10 +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
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
