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

25997 commits

This branch
This branch
All branches
Author SHA1 Message Date
おさむのひと
5ccd61b1f8
Revert "fix #12528 (#12536)" (#12548) 
This reverts commit a5f0b5ec74.
 2023-12-03 10:17:07 +09:00
Insert5StarName
5db163bc67 upd: rework threading ui 2/2 
Co-authored-by: daph <d@waal.me>
Co-authored-by: Marie <marie@kaifa.ch>
 2023-12-02 20:29:01 +01:00
Marie
419bde43a6
upd: make Show changes redirect to the latest release page 
Closes #192
 2023-12-02 19:37:22 +01:00
Insert5StarName
183d24d63e fix: replys only going one layer deep 2023-12-02 13:55:15 +01:00
Mar0xy
45e191674d
fix: notifications not applying noteDesign option 2023-12-02 13:27:31 +01:00
Mar0xy
f0fe8eceaf
upd: add option to select between note designs 
Adds the ability to choose between `Sharkey` or `Misskey`
 2023-12-02 13:09:25 +01:00
おさむのひと
336416261a
バックエンドが生成するapi.jsonからmisskey-jsの型を作成する (#12434) 
* ひとまず生成できるところまで

* ファイル構成整理

* 生成コマンド整理

* misskey-jsへの組み込み

* fix generator.ts

* wip

* fix generator.ts

* fix package.json

* 生成ロジックの調整

* 型レベルでのswitch-case機構をmisskey-jsからfrontendに持ち込めるようにした

* 型チェック用のtsconfig.jsonを作成

* 他のエンドポイントを呼ぶ関数にも適用

* 未使用エンティティなどを削除

* misskey-js側で手動定義されていた型を自動生成された型に移行（ただしapi.jsonがvalidでなくなってしまったので後で修正する）

* messagingは廃止されている（テストのビルドエラー解消）

* validなapi.jsonを出力できるように修正

* 修正漏れ対応

* Ajvに怒られて起動できなかったところを修正

* fix ci（途中）

* パラメータenumをやめる

* add command

* add api.json

* 都度自動生成をやめる

* 一気通貫スクリプト修正

* fix ci

* 生成ロジック修正

* フロントの型チェックは結局やらなかったので戻しておく

* fix pnpm-lock.yaml

* add README.md

---------

Co-authored-by: osamu <46447427+sam-osamu@users.noreply.github.com>
Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
 2023-12-02 21:00:05 +09:00
おさむのひと
92029ac325
fix: #12544 (#12545) 
* meを渡し忘れている

* fix CHANGELOG.md

* Revert "fix CHANGELOG.md"

This reverts commit aaee4e9b8a6abf510f393bc02282f6ac016d2124.
 2023-12-02 20:11:31 +09:00
MeiMei
238e8ce939
fix: Filter featured collection (#12541) 2023-12-02 19:32:30 +09:00
anatawa12
a631b976c9
Refine fanout timeline (#12507) 
* chore(endpoints/hybrid-timeline): don't pack inside getFromDb

* chore(endpoints/hybrid-timeline): Redisから取得する部分のうちSTLに依存しなそうなところを別のServiceに切り出し

* chore(endpoints/local-timeline): FanoutTimelineEndpointServiceで再実装

* chore(endpoints/channels/timeline): FanoutTimelineEndpointServiceで再実装

* chore(endpoints/timeline): FanoutTimelineEndpointServiceで再実装

* chore(endpoints/user-list-timeline): FanoutTimelineEndpointServiceで再実装

* chore(endpoints/users/notes): FanoutTimelineEndpointServiceで再実装

* chore: add useDbFallback to FanoutTimelineEndpointService.timeline and always true for channel / user note list

* style: fix lint error

* chore: split logic to multiple functions

* chore: implement redis fallback

* chore: 成功率を上げる

* fix: db fallback not working

* feat: allowPartial

* chore(frontend): set allowPartial

* chore(backend): remove fallbackIfEmpty

HTL will never be purged so it's no longer required

* fix: missing allowPartial in channel timeline

* fix: type of timelineConfig in hybrid-timeline

---------

Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
 2023-12-02 18:25:07 +09:00
paihu
cf3d45e7c8
fix(frontend): MFM ruby nyaize (#12362) 2023-12-02 17:09:22 +09:00
Camilla Ett
8968bfd309
fix(backend): カスタム絵文字のインポート時の動作を修正 (#12360) 
Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
 2023-12-02 17:07:57 +09:00
meron
c190b720d3
feat(frontend): 絵文字ピッカーのカテゴリを多階層フォルダで分類できるように (#12132) 
* Update CHANGELOG.md

* Feat:emoji picker folder select

* Fix: lint error

* Fix: lint error 2

* Fix: lint error 3

* カスタム絵文字のカテゴリ表示部分が長かったので短くした

* エフェクトが壊れて出ないのを修正

* padding 18px -> 9px

* Update CHANGELOG.md

* Revert: en-US.yml

* chg: Folder -> folder

* chg: isChildrenExits -> isChildren

* chg: isChildren -> categoryFolderFlag

* カテゴリ末尾が / の場合ピッカーから消失するので「その他」と扱い対応

* 特定のパターンのカテゴリ名でピッカーに出てこないのを修正

「i18n.ts.other」や「/」始まりの場合壊れる

* chg: categoryFolderFlag -> hasChildSection

* code format

* Del: ti-fw

* fix

* 絵文字とフォルダの表示順序入れ替え

* ネストした場合にパネルでどこまでがどのフォルダのものかをわかりやすくした

* fix lint

* カテゴリの名前が長いと表示がおかしくなる問題を修正

Co-authored-by: まっちゃとーにゅ <17376330+u1-liquid@users.noreply.github.com>

---------

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>
Co-authored-by: まっちゃとーにゅ <17376330+u1-liquid@users.noreply.github.com>
 2023-12-02 15:26:46 +09:00
anatawa12
b6b838416d
chore: remove unimplemented excludeNsfw (#12520) 2023-12-02 12:05:53 +09:00
かっこかり
b37e8ffa69
(fix) 翻訳のダブりを解消 (#12519) 2023-12-02 12:05:03 +09:00
anatawa12
da0ecb650e
chore: フォローしたときにHTLをパージしなくする (#12522) 2023-12-02 12:04:30 +09:00
zyoshoka
43c9ab2072
fix(frontend): 長い名前のチャンネルにおける投稿フォームの表示が崩れる問題を修正 (#12524) 
* fix(frontend): 長い名前のチャンネルにおける投稿フォームの表示が崩れる問題を修正

* Update CHANGELOG.md
 2023-12-02 12:04:11 +09:00
Marie
1c75339471
chore: add documentation section to README 2023-12-02 03:55:44 +01:00
おさむのひと
a5f0b5ec74
fix #12528 (#12536) 2023-12-02 11:37:31 +09:00
Insert5StarName
1a4bff7698 upd: rework threading/post ui 1/2 
Co-authored-by: Gaspard Wierzbinski <contact@cpluspatch.com>
Co-authored-by: Marie <marie@kaifa.ch>
 2023-12-02 01:39:29 +01:00
Qwreey
c927d6824c
Fix: missing receiver warn is not disappear (#12538) 2023-12-02 09:28:00 +09:00
Marie
ad5a6c1e41
fix: reactions escaping view in note view 2023-12-01 14:51:48 +01:00
nullnyat
5cd4c36cad
rename docker-compose.yml.example to docker-compose_example.yml (#12530) 
* rename docker-compose.yml.example to docker-compose_example.yml

* fix: dockle.yml
 2023-12-01 11:19:33 +09:00
Marie
749befdf63
chore: up dev version 2023-12-01 00:29:26 +01:00
Mar0xy
dcce9ba70b
chore: remove console log 2023-11-30 23:49:33 +01:00
Mar0xy
a707b410d0
Merge branch 'develop' of https://github.com/transfem-org/Sharkey into develop 2023-11-30 23:45:25 +01:00
Mar0xy
126b3839dd
upd: add basic search widget 
Closes transfem-org/Sharkey#181
 2023-11-30 23:45:13 +01:00
Mar0xy
90ddbc5dcd
upd: add info about multiple choices for polls 
closes transfem-org/Sharkey#182
 2023-11-30 22:16:42 +01:00
Mar0xy
7251f12908
upd: lower max uses per hour on import notes 2023-11-30 22:05:13 +01:00
Marie
acfb24517a
merge: thread more imports (#187) 2023-11-30 18:55:36 +01:00
dakkar
c958d935e4 thread Pleroma imports as well 
I have _not_ tested this, but it should work fine, those exports are
the same shape as Mastodon's
 2023-11-30 13:26:55 +00:00
dakkar
c59e74dfd5 fix chaining for Mastodon notes 
the id / replyId are not at the top level, so now `recreateChain`
takes a list of keys to walk, not just a single key
 2023-11-30 13:26:55 +00:00
dakkar
15503b96a0 properly thread Mastodon imports 2023-11-30 13:26:55 +00:00
Gianni Ceccarelli
e392d523a7 prepare to import more notes 
`recreateChain` converts a list of notes into a forest of notes, using
notes that are not replies as roots, and replies as child nodes,
recursively.

Previously, notes that are replies to notes not included in the
export, and their children, were never put in the forest, and
therefore wheren't imported.

This can be fine when importing from Twitter, since we can't really
link a note to a tweet.

And, for the moment, it's acceptable when importing from *key, because
the export doesn't contain the instance URL, so we can't resolve ids
to remote notes.

It's less fine when importing from Mastodon / Pleroma / Akkoma,
because in those cases we _can_ link to the remote note that the user
was replying to.

This commit makes `recreateChain` optionally return "orphaned" note
trees, so in the (near) future we can use it to properly thread
imported notes from those services.
 2023-11-30 13:26:55 +00:00
dependabot[bot]
7ef50b4c8e
chore(deps): bump actions/first-interaction from 1.2.0 to 1.3.0 (#186) 
Bumps [actions/first-interaction](https://github.com/actions/first-interaction) from 1.2.0 to 1.3.0.
- [Release notes](https://github.com/actions/first-interaction/releases)
- [Commits](https://github.com/actions/first-interaction/compare/v1.2.0...v1.3.0)

---
updated-dependencies:
- dependency-name: actions/first-interaction
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2023-11-30 13:46:56 +01:00
Gianni Ceccarelli
f905f8c50c
locale: some more Italian translations & fix english translations (#185) 2023-11-30 13:45:25 +01:00
Insert5StarName
97bd4e6f82 chore: add locales for defaultLike 2023-11-30 13:25:35 +01:00
yupix
ca424df80e
fix: invite系の戻り値が間違っている close #12517 (#12518) 2023-11-30 15:56:25 +09:00
Srgr0
e500fe2586
絵文字詳細ページに記載する情報を追加 (#12417) 
* Update emojis.emoji.vue

* Update CHANGELOG.md

---------

Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
 2023-11-30 14:59:42 +09:00
Mar0xy
13550bac35
upd: remove reload from DisconnectedBehavior 
This feature was mainly broken and there is no real way to fix it and as it is mostly not needed it is easier to just remove it.

Closes transfem-org/Sharkey#43
 2023-11-30 06:59:24 +01:00
かっこかり
b05d71fabf
feat(frontend): 今日誕生日のフォロー中のユーザーを一覧表示できるウィジェットを追加 (#12450) 
* (add) 今日誕生日のフォロイー一覧表示

* Update Changelog

* Update Changelog

* 実装漏れ

* create index

* (fix) index
 2023-11-30 14:49:26 +09:00
yukineko
22d6fa1fdf
enhance(dev): 開発モード時にlocaleと型定義が自動的に再生成されるように (#12481) 
* enhance: localeを任意のタイミングでリビルドできるように

* enhance: localeも監視し、必要であればlocaleをリビルドするように

* feat: devモードの時のみナビゲーションバーからキャッシュクリアができるように

* refactor: キャッシュクリア部分を共通化

* fix: localesのファイル変更イベントが取れないのを修正

* fix: replaceAllでコケるのを修正

* change: 開発モードに関係なくナビゲーションバーからキャッシュクリアできるように

* refactor: 必要のないリビルドをしないように

* update: CHANGELOG.md

---------

Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
 2023-11-30 14:48:02 +09:00
Cocoa Hoto
4f6e098542
fix(docker): cannot build docker image on some environments (#12494) 2023-11-30 14:47:08 +09:00
Kisaragi
47a10f6a6d
refactor(frontend): give local variable to explicit type annotation to avoid TS7043 (#12495) 
* refactor: give local variable to explicit type annotation to avoid TS7043

* chore: fix lint error
 2023-11-30 14:46:16 +09:00
GrapeApple0
28cb0fc70b
enhance: 設定したタグをトレンドに表示させないようにする項目を管理画面で設定できるように (#12512) 
* enhance: hiddenTagsを管理画面で設定できるように

* Update locales/ja-JP.yml

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

---------

Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
 2023-11-30 14:35:56 +09:00
zyoshoka
98e1af28b8
enhance(frontend): ノートプレビューにCWが反映されるように (#12509) 
* enhance(frontend): ノートプレビューにCWが反映されるように

* Update CHANGELOG.md

* refactor: 不要な条件を除去

* Revert "refactor: 不要な条件を除去"

This reverts commit e4eff689bd1f2df78411a2f01ee05434e2d298a8.

* fix: やっぱり不要な条件だった
 2023-11-30 13:49:31 +09:00
Mar0xy
9383e3affd
upd: remove accidental additions 2023-11-30 04:05:11 +01:00
Mar0xy
fcbb291ef1
upd: pass a few more AP values 
The added values are all taken from Mastodon code in hope to make editing and everything else sync better
 2023-11-30 04:01:07 +01:00
Mar0xy
b2d188aab1
chore: bump axios dep version in megalodon 2023-11-30 02:29:50 +01:00
Mar0xy
2fe100c71a
upd: disable ws disconnect warning by default 
This mostly is a false flag in the first place and also something that tends to annoy quite a lot of people.
 2023-11-30 02:26:56 +01:00