graphite/Sharkey
1
0
Fork 0
mirror of https://git.joinsharkey.org/Sharkey/Sharkey.git synced 2024-11-10 10:03:08 +02:00
Code Issues Projects Releases Packages Wiki Activity
25576 commits 62 branches 916 tags 154 MiB
Commit graph

1942 commits

Author SHA1 Message Date
syuilo
9d78a1a8b3 enhance(backend): make ftt db fallback configurable 2023-11-16 10:20:57 +09:00
Mar0xy
8779c0defd
chore: replace misskey_app with sharkey_app 2023-11-15 23:52:09 +01:00
Mar0xy
572fe7d8e7
upd: replace default error images 2023-11-15 23:47:29 +01:00
syuilo
ca81f0ddbb fix(backend): 追加情報のカスタム絵文字がユーザー情報のtagに含まれない問題を修正 
Fix #12316
 2023-11-15 16:17:21 +09:00
syuilo
be6778ac61 chore(backend): improve performance 2023-11-15 16:10:05 +09:00
Jaehong Kang
04075ee0be
enhance(backend): Implementation of HTTP header and body validation to fix SIF-2023-002 (#12334) 
Using Buffer instead of string

Co-authored-by: perillamint <perillamint@silicon.moe>
 2023-11-15 11:13:34 +09:00
zyoshoka
aa6d0d4359
fix(backend): 非公開の投稿に対して返信できないように (#12333) 
* fix(backend): 非公開の投稿に対して返信できないように

* Update CHANGELOG.md

* fix: test
 2023-11-15 11:10:45 +09:00
syuilo
65c5626b65
Merge pull request from GHSA-3f39-6537-3cgc 
This commit implements HTTP header and body validation to fix
[SIF-2023-002](https://advisory.silicon.moe/advisory/sif-2023-002/)

Signed-off-by: perillamint <perillamint@silicon.moe>
Co-authored-by: perillamint <perillamint@silicon.moe>
Co-authored-by: yunochi <yuno@yunochi.com>
 2023-11-14 17:09:45 +09:00
syuilo
30bb24d18c update deps 2023-11-14 10:35:48 +09:00
syuilo
2d2eefe3d4 feat: メールアドレスを使用してユーザー名を割り出す機能 
Resolve #10158
 2023-11-14 07:58:18 +09:00
Mar0xy
e4bd74183f
chore: remove type in DbNoteImportToDbJobData 2023-11-13 13:09:21 +01:00
Mar0xy
6f76a3a1f8
upd: import replies to own posts on *key 2023-11-13 13:07:49 +01:00
Mar0xy
9b3993a652
fix: prevent *key renotes/boosts from being imported 
Stop renotes/boosts from *key from being imported due to missing functionality of getting the related posts
 2023-11-13 10:25:39 +01:00
おさむのひと
e1cc95d308
ユーザのノートのみ表示時にDBへフォールバックするとリノートを含んでしまうのを修正 (#12321) 
* ユーザのノートのみ表示時にDBへフォールバックするとリノートを含んでしまうのを修正

* fix CHANGELOG.md

---------

Co-authored-by: osamu <46447427+sam-osamu@users.noreply.github.com>
 2023-11-13 09:27:37 +09:00
Mar0xy
6170461dc5
upd: add additional checks for akkoma and pleroma 2023-11-12 22:27:20 +01:00
Mar0xy
5c38e6b824
add: custom like emoji per instance, fix like 
This fixes the fact that likes on mastodon didn't get federated properly and let's instance admins choose a custom emoji
 2023-11-12 22:16:47 +01:00
Mar0xy
1f8c12b984
fix: use a proper function 2023-11-12 18:19:44 +01:00
Mar0xy
8cad8f0ae5
fix: broken unicode in strings on IG imports 2023-11-12 18:12:39 +01:00
Mar0xy
486a2ad839
upd: remove unused function, fix logger message 2023-11-12 18:01:39 +01:00
Mar0xy
bc25b28a4e
fix: cleanup not available on development env 2023-11-12 17:32:24 +01:00
Mar0xy
b7fc13efb7
upd: pass full thinuser 2023-11-12 15:48:28 +01:00
Mar0xy
2d1e8ee44d
upd: update limit 2023-11-12 15:37:36 +01:00
Mar0xy
de9ea4d9f1
fix: type 2023-11-12 15:16:27 +01:00
Mar0xy
83f328de8a add: Importing of Posts 
- Supports Instagram, Mastodon/Pleroma/Akkoma, Twitter and *key
 2023-11-12 15:12:42 +01:00
Mar0xy
4f0e0f067e
upd: set file user to system when adding emoji 
Prevents cluttering of user's drive and fits the custom emoji import which sets the user as system
 2023-11-12 14:00:35 +01:00
atsuchan
50430e310a
Fix: latestRequestReceivedAt (#12270) 2023-11-11 14:51:29 +09:00
Mar0xy
d94b1c3fe0
chore: lint 2023-11-09 15:07:23 +01:00
Mar0xy
885800ee5e
revert: deletion of oauth.pug 2023-11-09 15:06:57 +01:00
Mar0xy
fdb36f1d96
fix: oauth/authorize and token showing error page 2023-11-09 15:00:38 +01:00
Mar0xy
fd51854670
revert: trending support for redis 6.3 
It seems this change has caused redis to periodically crash on big instances
 2023-11-09 14:51:19 +01:00
GrapeApple0
28e394eddc
fix: 投稿通知がオンでもダイレクト投稿はユーザーに通知されないように (#12263) 
* fix: 投稿通知がオンでもダイレクト投稿はユーザーに通知されないように

* Update CHANGELOG.md
 2023-11-09 21:35:07 +09:00
Nya Candy
e2cac3d949
fix: show real instance url (#12273) 
* Update CHANGELOG.md

* fix: show real instance url

---------

Co-authored-by: tamaina <tamaina@hotmail.co.jp>
Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
Co-authored-by: atsuchan <83960488+atsu1125@users.noreply.github.com>
Co-authored-by: Masaya Suzuki <15100604+massongit@users.noreply.github.com>
Co-authored-by: Kagami Sascha Rosylight <saschanaz@outlook.com>
Co-authored-by: taiy <53635909+taiyme@users.noreply.github.com>
Co-authored-by: xianon <xianon@hotmail.co.jp>
Co-authored-by: kabo2468 <28654659+kabo2468@users.noreply.github.com>
Co-authored-by: YS <47836716+yszkst@users.noreply.github.com>
Co-authored-by: Khsmty <me@khsmty.com>
Co-authored-by: Soni L <EnderMoneyMod@gmail.com>
Co-authored-by: mei23 <m@m544.net>
Co-authored-by: daima3629 <52790780+daima3629@users.noreply.github.com>
Co-authored-by: Windymelt <1113940+windymelt@users.noreply.github.com>
Co-authored-by: Ebise Lutica <7106976+EbiseLutica@users.noreply.github.com>
Co-authored-by: nenohi <kimutipartylove@gmail.com>
Co-authored-by: Acid Chicken (硫酸鶏) <root@acid-chicken.com>
Co-authored-by: rinsuki <428rinsuki+git@gmail.com>
Co-authored-by: FineArchs <133759614+FineArchs@users.noreply.github.com>
 2023-11-09 21:21:39 +09:00
Mar0xy
49e3a31bba
fix: not starting due to duplicate endpoint 2023-11-08 22:55:18 +01:00
Mar0xy
0087bc3ace
test: oauth/authorize on api endpoint 2023-11-08 22:45:40 +01:00
Mar0xy
c5008452c1
fix: oauth/authorize not working 2023-11-08 22:18:28 +01:00
Mar0xy
88da6f16a9
upd: add oauth decision endpoint 2023-11-08 21:11:54 +01:00
zyoshoka
2834e54e78
fix(backend): make token nullable (#12280) 2023-11-08 21:10:41 +09:00
Mar0xy
04657c14c7
upd: remove leftover nsfw ai option 2023-11-07 19:23:58 +01:00
Mar0xy
9cd2759769
feat: isIndexable 2023-11-07 19:16:57 +01:00
Mar0xy
53f2089116
fix: lastReceivedAt always being N/A 2023-11-07 18:30:04 +01:00
Mar0xy
ccd3789cc6
fix: plugin uninstall throwing error 2023-11-07 18:22:52 +01:00
Mar0xy
d85cf658ca
upd: export headers used during signin 2023-11-07 18:18:04 +01:00
Mar0xy
42a5d473e5
upd: remove remaining parts of tw 2023-11-07 17:10:27 +01:00
Mar0xy
42ecde475e
upd: add IPs to data export 2023-11-07 12:20:46 +01:00
Mar0xy
fabb876256
upd: send email on export completion 2023-11-07 11:31:11 +01:00
Mar0xy
e9b6ed941b
add: endpoint and processor for account data export 2023-11-07 03:31:47 +01:00
Marie
ecf63c4333
merge: remove tensorflow, AiService (#140) 2023-11-05 14:42:15 +01:00
ShittyKopper
c1f9670439 fix: FileInfoService unit test 2023-11-05 16:28:55 +03:00
ShittyKopper
36c136cfd2 upd: remove more traces of sensitiveMediaDetection 
kept the api endpoint props just to stay compatible with clients that
expect them to be there. they are unused and won't get saved
 2023-11-05 16:28:55 +03:00
Mar0xy
e50ac8ccc7
fix: withreplies not being applied to DB fallback 2023-11-05 13:25:35 +01:00
Mar0xy
35b3ac228c
merge: upstream 2023-11-05 11:19:03 +01:00
ShittyKopper
2eda00d9b9 upd: rip out AiService 2023-11-05 11:55:19 +03:00
Marie
2cce28533f
fix(backend): isBot not being set on Application type (#12248) 
* fix: bot not being set on all relays

* updatePerson missing the change

* chore: replace wrong word with correct word
 2023-11-05 10:22:10 +09:00
syuilo
c2ddb649f8 enhance: 非通知なお知らせを作成できるように 2023-11-05 09:04:38 +09:00
syuilo
bdbb3266ae fix(backend): アーカイブしたお知らせがコントロールパネルに表示される問題を修正 2023-11-05 09:04:03 +09:00
Mar0xy
647e76ab36
merge: upstream 2023-11-04 14:32:28 +01:00
ozelot
1e737dbb94
fix(backend): GTLの「リノートを表示」オプションが機能しないのを修正 (#12234) 
* fix(backend): GTLの「リノートを表示」オプションが機能しないのを修正 (#12233)

* docs: Update changelog

* Apply suggestions from code review

Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>

---------

Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
 2023-11-04 18:45:59 +09:00
Mar0xy
7c480424a6
merge: upstream 2023-11-03 15:35:12 +01:00
おさむのひと
39a3f4ae98
feat: チャンネル内→チャンネル外へのリノート制限機能追加 (#12230) 
* チャンネル内→チャンネル外へのリノート制限機能追加

* fix CHANGELOG.md

* コメント対応（canRenoteSwitch→allowRenoteToExternal）

* コメント対応（別チャンネルへのリノート対策）

* コメント対応（canRenote->allowRenoteToExternal）

* fix comment

* Update misskey-js.api.md

* ✌️

---------

Co-authored-by: osamu <46447427+sam-osamu@users.noreply.github.com>
Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
 2023-11-03 17:34:23 +09:00
かっこかり
24e629ca5c
enhance: 初期設定とチュートリアルを統合 (#12141) 
* better onboarding experience

* enhance: iroiro

* (add) title

* (enhance) 戻る・次へボタンを全ページでstickyに

* fix merging

* (add) iroiro

* remove unnecessary file

* Update CHANGELOG.md

* tweak texts

* (fix) reactionViewer mock

* change strings

* Update MkTutorialDialog.Note.vue

* Update ja-JP.yml

* (fix) reactionViewer error

* (fix) path

* refactor

* fix

* Update MkPostForm.vue

* Update ja-JP.yml

* Update ja-JP.yml

* tweak text

* Update ja-JP.yml

* Update ja-JP.yml

* Update ja-JP.yml

* (add) achivement

* (add) もう一度見れますよメッセージを追加

* Revert "feat: レジストリAPIをサードパーティから利用可能に (#12229)"

This reverts commit 79346272f8.

* Revert "(add) もう一度見れますよメッセージを追加"

This reverts commit 6123b35215133f0d5e5db356bb43f4acbafab8fa.

* Revert "Revert "feat: レジストリAPIをサードパーティから利用可能に (#12229)""

This reverts commit bae684e484ef99308d7ac816a822047117efe1c6.

* tweak

---------

Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
 2023-11-03 15:35:07 +09:00
yukineko
025ae436b5
enhance: アカウント登録時のメールアドレス認証に30分の有効期限を設定 (#12221) 
* add: metaにemailVerificationExpiresInを追加

* enhance: 招待コード使用時, メアド認証時に認証期限を確認するように

* add: クライアント側に実装

* update: CHANGELOG.md

* add: コメントを追加

* Revert "add: metaにemailVerificationExpiresInを追加"

This reverts commit ceb6ccff51a406bfd87b4da6c59401ce5551dd95.

* Revert "add: コメントを追加"

This reverts commit 7ee301c3eed4ded295490a6614650a3720317772.

* change(client): メール認証の有効期限を30分で固定するように変更

* change(backend): メール認証の有効期限を30分で固定するように変更

* update: CHANGELOG.md
 2023-11-03 14:54:28 +09:00
syuilo
1729307fcf update deps 2023-11-03 14:41:21 +09:00
anatawa12
3e00b32fae
build: port vite port configuration (#12223) 2023-11-03 13:34:57 +09:00
syuilo
0efacdfcf0 fix cw test 2023-11-03 13:26:48 +09:00
syuilo
79346272f8
feat: レジストリAPIをサードパーティから利用可能に (#12229) 
* wip

* wip

* Update remove.ts

* refactor
 2023-11-03 13:23:03 +09:00
syuilo
82526ad4f3 CWを使用する場合、注釈を空にすることを許可しない 
Resolve #12217
 2023-11-03 08:17:35 +09:00
Mar0xy
4da9d94a16
fix: replies showing if not set to show replies 2023-11-03 00:12:54 +01:00
Mar0xy
a8b4689501
upd: add modplayer 2023-11-02 23:14:36 +01:00
dakkar
219c7fa6ec always preserve old text when editing a note 
before this change:

* create a note, with text
  * `note` has a row with the text
	* `note_edit` doesn't have any matching row
* edit the note, removing all the text
  * the row in `note` has the new, empty, text
	* `note_edit` has a matching row, but its `oldText` is NULL

so the original text is lost

after this change, the row in `note_edit` always keeps the previous
text
 2023-11-02 14:28:23 +00:00
syuilo
f62ad3ed3e feat: notification grouping 
Resolve #12211
 2023-11-02 15:57:55 +09:00
ShittyKopper
72204d9294 Revert "prototype: decreased rounding" 
This reverts commit 7a51e2d404.
 2023-11-01 21:43:26 +03:00
ShittyKopper
e1844db11b upd: add corner roundness setting 2023-11-01 21:43:26 +03:00
Mar0xy
d252dc3d93
upd: apply same changes to featured 2023-11-01 15:00:24 +01:00
Mar0xy
61c66b3825
upd: move TTL after pipeline execution 2023-11-01 14:51:50 +01:00
Mar0xy
4fbd9dcfbf
upd: make hashtagservice compatible with redis 6.3 2023-11-01 14:47:36 +01:00
Mar0xy
8388b18df9
merge: upstream 2023-11-01 12:39:07 +01:00
syuilo
6a73f7c108 i/updateのレートリミットを緩和 2023-11-01 20:29:58 +09:00
syuilo
e88dbad3cf tweak test 2023-11-01 15:56:57 +09:00
syuilo
9b073e5fe6 fix 2023-11-01 15:32:35 +09:00
syuilo
77db652bff update deps 2023-11-01 14:06:54 +09:00
syuilo
e632a84431 tweak default configuration 2023-11-01 14:00:31 +09:00
syuilo
7ed2a5fc1b perf(backend): remove needless query 
#12206
 2023-11-01 13:55:19 +09:00
かっこかり
5fb6847419
Feat: 未読通知数を表示できるように (#11982) 
* 未読通知数を表示できるように

* Update Changelog

* オプトインにする

* Fix lint

* (add) テスト通知のプッシュ通知を追加

* add test

* フロントエンドの表示上限を99に変更

* Make it default on

* 共通スタイルをくくりだす

* Update Changelog

* tweak

* Update UserEntityService.ts

* rename

* Update navbar-for-mobile.vue

---------

Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
 2023-11-01 13:34:05 +09:00
Mar0xy
b02a977606
revert: previous commit 2023-11-01 01:43:01 +01:00
Mar0xy
629c605b67
upd: renderUpdate on attachments 2023-11-01 01:38:03 +01:00
Mar0xy
d49cc29923
chore: add attribution 2023-11-01 00:55:53 +01:00
Mar0xy
a2161ccb53
chore: remove debug line, change example.yml 
Set the default meilisearch scope to global
 2023-11-01 00:42:08 +01:00
Mar0xy
e9fafe9b51
test: debug meilisearch not being found 2023-11-01 00:33:29 +01:00
Mar0xy
86db03cdd6
test: update debug lines 2023-11-01 00:26:21 +01:00
Mar0xy
232ac0d94e
test: debug meilisearch 2023-11-01 00:14:59 +01:00
Mar0xy
4dd23a3793
merge: upstream 2023-10-31 19:33:24 +01:00
dakkar
044d3d76e7 actually fix #118 
`note.fileIds` is an array, it's always going to be truthy; we need to
check the length, like a similar `if` does just a few lines above
 2023-10-31 16:16:39 +00:00
dakkar
111863b396 try to fix #118 
when fetching notes from Redis, we need to re-check the criteria from
the API request, because `userTimelineWithFiles`,
`userTimelineWithReplies`, `userTimelineWithChannel` all get merged
together, so `noteIds` may well contain notes without attachments…
 2023-10-31 15:18:37 +00:00
Mar0xy
b57b644ec6
chore: remove console log on verify_credentials 2023-10-31 12:13:37 +01:00
Mar0xy
6673c7fc13
fix: limit query being returned as string instead of int 2023-10-31 12:06:47 +01:00
Mar0xy
c18efe0042
upd: add empty return on trends/links 2023-10-31 11:49:34 +01:00
Mar0xy
98389114a8
fix: suggestions 2023-10-31 11:46:08 +01:00
Mar0xy
171ba6f4f5
chore: change style of getStatusTrends 2023-10-31 11:38:23 +01:00
Mar0xy
0a9ca195e2
fix: create trends/tags endpoint 2023-10-31 11:34:25 +01:00
Mar0xy
d15c588080
upd: change handling of suggestions and status trends 2023-10-31 11:31:31 +01:00