amechama/sharkey
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
26,764 Commits 3 Branches 0 Tags 162 MiB
f9a7cd0daa
Commit Graph

26764 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Amelia Yukii
8197148209 merge: Add fail safe for sponsors endpoint in case of not being able to connect (!436) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/436

Closes #428

Approved-by: Amelia Yukii <amelia.yukii@shourai.de>
Approved-by: dakkar <dakkar@thenautilus.net>
 2024-02-21 18:59:31 +00:00
Marie
349f846f32 Add fail safe for sponsors endpoint in case of not being able to connect 2024-02-21 18:59:31 +00:00
Amelia Yukii
a1a3eec262 merge: Optimized pattern drawing in MkModPlayer (!410) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/410

Approved-by: Amelia Yukii <amelia.yukii@shourai.de>
Approved-by: dakkar <dakkar@thenautilus.net>
 2024-02-21 16:17:13 +00:00
Vavency
897bc631f7 Optimized pattern drawing in MkModPlayer 2024-02-21 16:17:13 +00:00
anatawa12
b36e6b1a77
fix: 禁止キーワードを含むノートがDelayed Queueに追加されて再処理される問題 (#13428) 
* refactor: use IdentifiableError instead of NoteCreateService.ContainsProhibitedWordsError

* fix: notes with prohibited words are reprocessed with delay

* docs(changelog): 禁止キーワードを含むノートがDelayed Queueに追加されて再処理される問題

* lint: fix lint errors

* fix: rethrowするべきなのにrethrowし忘れていたのを修正
 2024-02-22 00:59:59 +09:00
anatawa12
e10ce7204c
fix: MkUserPopupが表示されてる状態でv-user-previewがついた要素がdetachされるとMkUserPopupが消えない問題 (#13349) 
* fix: MkUserPopupが表示されてる状態でv-user-previewがついた要素がdetachされるとMkUserPopupが消えない問題

* docs(changelog): previewの中のユーザメンションをホバーした状態で投稿を編集するとユーザの情報popupが消えない問題を修正

* docs(changelog): ユーザの情報のポップアップが消えなくなることがある問題を修正
 2024-02-21 20:15:04 +09:00
syuilo
fb0eb5a31f 🎨 2024-02-21 18:35:05 +09:00
tamaina
ae27085f69
fix: Bump sharp to 0.33.2 (#13391) 2024-02-21 14:42:37 +09:00
okayurisotto
750d262604
refactor(backend): ReactionService.prototype.convertLegacyReactions (#13375) 
* add unit tests

* cleanup unnecessary type assertions

* `convertedReaction`変数の定義と変換表に対する存在確認処理の整理

* `count`変数の定義とループ処理での`Object.entries()`の活用

* 条件式の整理

* `Array.prototype.reduce`を使うように

* `Array.prototype.reduce`を使うように

* 配列操作を1つのメソッドチェーンに整理

これまでの実装では、`decodeReaction`の返り値が同一になる異なる入力値が同時に複数個存在した場合、後ろのもので上書きされてしまっていたはず。
これからの実装では、後ろのものは前のものに加算される。
（実際にこの挙動の変更が問題になるシチュエーションはまずないはず。）

* add unit test

* ドキュメントコメントの追加と型定義の調整
 2024-02-21 14:31:50 +09:00
かっこかり
bbbb16795d
refactor(frontend): 不必要なconsole.logを除去・抑制 (#13400) 
* refactor(frontend): 不必要なconsole.logを除去

* Update MkCode.core.vue

* Update game.board.vue
 2024-02-21 14:27:06 +09:00
Amelia Yukii
78975ddcc8 merge: Switch source code bits (!435) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/435

Approved-by: Julia Johannesen <julia@insertdomain.name>
Approved-by: Amelia Yukii <amelia.yukii@shourai.de>
 2024-02-20 20:01:31 +00:00
dakkar
c9940b7359 Switch source code bits 2024-02-20 20:01:31 +00:00
Amelia Yukii
ff8cfeb05c merge: avoid look-behind in nyaize - fixes 419 (!433) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/433

Approved-by: Julia Johannesen <julia@insertdomain.name>
Approved-by: Amelia Yukii <amelia.yukii@shourai.de>
 2024-02-20 20:00:22 +00:00
dakkar
b02ded29dd avoid look-behind in nyaize - fixes 419 2024-02-20 20:00:22 +00:00
Amelia Yukii
27ea1b7133 merge: Note Edited notification type (!432) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/432

Closes #403

Approved-by: Amelia Yukii <amelia.yukii@shourai.de>
Approved-by: dakkar <dakkar@thenautilus.net>
 2024-02-20 15:10:41 +00:00
Marie
4a13508da0 Note Edited notification type 2024-02-20 15:10:41 +00:00
zyoshoka
f18a31c628
fix(frontend): 画面表示後最初の音声再生が爆音になることがある問題を修正 (#13379) 
* fix(frontend): 画面表示後最初の音声再生が爆音になることがある問題を修正

* Update CHANGELOG.md

* Update CHANGELOG.md
 2024-02-20 15:26:11 +09:00
zyoshoka
39c4e3a4f5
fix(frontend): チャートのラベルが消えている問題を修正 (#13416) 
* fix(frontend): チャートのラベルが消えている問題を修正

* Update CHANGELOG.md
 2024-02-20 14:00:57 +09:00
Marie
15665d1533 merge: Warn when missing alt text (!423) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/423

Approved-by: Amelia Yukii <amelia.yukii@shourai.de>
Approved-by: Marie <marie@kaifa.ch>
 2024-02-20 04:45:31 +00:00
Sayamame-beans
ddd7b26f1c
enhance(frontend): ノート作成画面の添付メニューのdividerの位置を"添付取り消し"の上にする (#13409) 
* enhance(frontend): change divider position for MkPostFormAttaches

* docs(changelog): update
 2024-02-20 11:59:49 +09:00
KevinWh0
3c4f3cb81d updated to use .some 2024-02-19 20:53:13 +01:00
Marie
6931f50af5 merge: check prohibited words when editing note (!429) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/429

Approved-by: Marie <marie@kaifa.ch>
Approved-by: Amelia Yukii <amelia.yukii@shourai.de>
 2024-02-19 19:19:27 +00:00
Marie
3912436f4f merge: hide blocked&c instances when not logged in - fixes #422 (!430) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/430

Closes #422

Approved-by: Marie <marie@kaifa.ch>
Approved-by: Amelia Yukii <amelia.yukii@shourai.de>
 2024-02-19 19:09:11 +00:00
Amelia Yukii
2fb1061f29 merge: point default repo/feedback URLs to our repos #414 (!419) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/419

Approved-by: Marie <marie@kaifa.ch>
Approved-by: Amelia Yukii <amelia.yukii@shourai.de>
 2024-02-19 19:08:15 +00:00
Marie
e248e41287 fix: merge conflict 2024-02-19 19:06:30 +00:00
Marie
4246b6434d merge: Merge upstream from 19th Feburary (!428) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/428

Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Amelia Yukii <amelia.yukii@shourai.de>
 2024-02-19 19:05:15 +00:00
Marie
d182402cfa
fix: icons and update urls 2024-02-19 18:46:42 +01:00
dakkar
bf82942245 hide blocked&c instances when not logged in - fixes 422 2024-02-19 14:53:24 +00:00
dakkar
9c1437bdf9 check prohibited words when editing note 2024-02-19 14:27:10 +00:00
dakkar
d1c174ea60 rename to get it applied after upstream changes 
upstream `1708266695091-repositoryUrl-from-syuilo-to-misskey-dev.js`
changes `repositoryUrl` to one of the values this patch recognise, so
let's do ours after theirs
 2024-02-19 11:41:35 +00:00
Marie
70f7f976fb
fix: url in new component 2024-02-19 10:51:25 +01:00
Marie
faaad229af
chore: add new note in example to docker example 2024-02-19 10:48:34 +01:00
Marie
10bfc61670
merge: upstream 2024-02-19 10:47:42 +01:00
かっこかり
9be3890827
Fix Changelog 2024-02-19 17:52:55 +09:00
Marie
764bbcf05b merge: Bridged error message for when you try search for a post and it fails (!421) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/421

Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Marie <marie@kaifa.ch>
 2024-02-19 08:33:10 +00:00
Marie
6ef2d471e9 merge: fix: keep alt text of file if present (!418) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/418

Approved-by: Amelia Yukii <amelia.yukii@shourai.de>
Approved-by: dakkar <dakkar@thenautilus.net>
 2024-02-19 01:27:08 +00:00
1Step621
034f47205e
Fix(frontend): オートコンプリートが出るべき状況で出ないことがあるのを修正 (#13376) 
* オートコンプリートが出るべき状況で出ないことがあるのを修正

* update CHANGELOG.md
 2024-02-19 08:36:06 +09:00
anatawa12
1b1046bcdb
fix: syuilo/misskey時代から使用してるサーバーが改変したバージョンだと誤判定される問題 (DB migrationで修正) (#13389) 2024-02-19 08:34:31 +09:00
anatawa12
0b636d1bf9
fix: nodeinfoにenableMcaptchaとenableTurnstileが無い (#13387) 2024-02-19 08:33:36 +09:00
Amelia Yukii
ec8a7b28a8 merge: rework boost visibility #388 (!420) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/420

Approved-by: Leah <kevinlukej@gmail.com>
Approved-by: Amelia Yukii <amelia.yukii@shourai.de>
Approved-by: Marie <marie@kaifa.ch>
 2024-02-18 16:26:07 +00:00
Marie
20a2c17882 merge: Add missing turnstile-response (!427) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/427

Approved-by: Amelia Yukii <amelia.yukii@shourai.de>
Approved-by: Marie <marie@kaifa.ch>
 2024-02-18 14:05:25 +00:00
Moe Poi
eedd8fd698 Add missing turnstile-response 2024-02-17 19:14:38 +00:00
Amelia Yukii
7b7de4cdb3 merge: ssrf fix for our develop (!426) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/426

Approved-by: Leah <kevinlukej@gmail.com>
Approved-by: Amelia Yukii <amelia.yukii@shourai.de>
 2024-02-17 13:15:50 +00:00
syuilo
7562d233c5 fix of 9a70ce8f5e 
Co-Authored-By: RyotaK <49341894+Ry0taK@users.noreply.github.com>
 2024-02-17 13:09:16 +00:00
tamaina
0a8ffd9cfa Merge pull request from GHSA-qqrm-9grj-6v32 
* maybe ok

* fix

* test wip

* ✌️

* fix

* if (res.ok)

* validateContentTypeSetAsJsonLD

* 条件を考慮し直す

* その他の+json接尾辞が付いているメディアタイプも受け容れる

* https://github.com/misskey-dev/misskey-ghsa-qqrm-9grj-6v32/pull/1#discussion_r1490999009

* add `; profile="https://www.w3.org/ns/activitystreams"`

* application/ld+json;
 2024-02-17 13:09:08 +00:00
Amelia Yukii
11d9fd9199 merge: import upstream ssrf fix on our stable (!425) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/425

Approved-by: Leah <kevinlukej@gmail.com>
Approved-by: Amelia Yukii <amelia.yukii@shourai.de>
 2024-02-17 13:06:47 +00:00
syuilo
6132bc3b3e fix of 9a70ce8f5e 
Co-Authored-By: RyotaK <49341894+Ry0taK@users.noreply.github.com>
 2024-02-17 12:54:45 +00:00
dakkar
fef7a7b99a bump version 2024-02-17 12:38:01 +00:00
tamaina
1948ca9aa8 Merge pull request from GHSA-qqrm-9grj-6v32 2024-02-17 12:36:44 +00:00
KevinWh0
0c28bfdb63 Added Japanese Translations 2024-02-17 13:31:03 +01:00