Commit graph

4567 commits

Author SHA1 Message Date
CGsama f5adccecb8 Merge commit '97a0127dbf0b96203902fb075b1d51659a921bfc'
Conflicts:
	pnpm-lock.yaml
2023-07-16 20:39:26 -04:00
Kainoa Kanter fa02334ddb Merge branch 'develop' into move-json5-to-prod-dependencies 2023-07-16 22:34:49 +00:00
ThatOneCalculator 2958655948
chore: 🎨 format 2023-07-16 15:33:17 -07:00
ThatOneCalculator 6165a4b580
Merge branch 'develop' of codeberg.org:calckey/calckey into develop 2023-07-16 15:32:45 -07:00
ThatOneCalculator bdc35a343e
refactor: 🚨 linting fix 2023-07-16 15:32:32 -07:00
freeplay 18260e1a63 feat: add view on remote server to user profile dropdowns 2023-07-16 17:46:30 -04:00
freeplay dfd900c09f Merge branch 'develop' of https://codeberg.org/calckey/calckey into upstream 2023-07-16 17:25:12 -04:00
freeplay 6fbbef1a8e fix: unable to scroll through reactions on mobile 2023-07-16 17:24:34 -04:00
ThatOneCalculator a88133c4bc
Merge branch 'develop' of codeberg.org:calckey/calckey into develop 2023-07-16 13:57:46 -07:00
ThatOneCalculator 04c0993f23
Merge branch 'fix/ssrf' into develop 2023-07-16 13:57:27 -07:00
Kainoa Kanter 1f7ca63d39 Merge pull request '[PR]: Fixes Post Import from Certain Mastodon Instances' (#10473) from dvd/calckey:fix/post-import into develop
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/10473
2023-07-16 20:51:47 +00:00
Kainoa Kanter 58cd156a54 Merge pull request '[PR]: Fix Quicktime (.mov) Video Player on Chrome' (#10503) from dvd/calckey:fix/quicktime-on-chrome into develop
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/10503
2023-07-16 18:14:51 +00:00
freeplay 48c52c3ee8 Merge branch 'develop' of https://codeberg.org/calckey/calckey into upstream 2023-07-16 13:42:21 -04:00
freeplay 5b5f997ecf fix: more reliable not closing emoji picker on shift key 2023-07-16 13:41:55 -04:00
DVD e38facfb7b
Fix: Quicktime Video Play on Chrome 2023-07-16 21:56:08 +08:00
CGsama 4bb6d7105a support new zip file by mastodon 2023-07-16 06:24:37 -04:00
Mizunashi Mana 1f441507f7 feat: Move json5 to prod dependencies 2023-07-16 19:00:51 +09:00
CGsama 35f09d0067 change wording 2023-07-16 03:24:37 -04:00
CGsama 0c9ab9fdfa fix format 2023-07-16 01:47:06 -04:00
CGsama 809d418018 use gunzip-maybe tar-stream to replace exec 2023-07-16 01:41:57 -04:00
CGsama 324d1a932d handle import mastodon package 2023-07-15 23:02:00 -04:00
コルセット姫@がんばらない cae6ba0edb feat: Add media to Mastodon and Calckey post imports (#10496)
### What does this PR do?

Adding files fields in the export notes option, and corresponding import notes

Current the mastodon import does not import any attachments, this pr will use the "upload from url" feature to include medias if its a valid URL.

There are many way to convert the outbox.json file, can be simple as upload media_attachments to any web hosting and do string replace on the json file.

I also create a tool that upload the tar.gz file with auto convert and host the media as simplify the process at https://tempfile.moegirl.live

Detail example can be found at https://fedi.moegirl.live/notes/9h76gtqnp2gwl5dz

https://r2temp.moegirl.live/2023/7/15/15356683-050f-423a-b331-c9a05561f52a/shana-settings-_-meng-zhai-le-yuan-xyou-yu-ou-xiang-de-luo-ke-ke-wu-yan-moe-otaku-elysian-x-gloomily-idol-s-rococo-luncheon----mozilla-firefox-private-browsing-2023-07-15-18-36-37.mp4

Co-authored-by: CGsama <CGsama@outlook.com>
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/10496
Co-authored-by: コルセット姫@がんばらない <cgsama@noreply.codeberg.org>
Co-committed-by: コルセット姫@がんばらない <cgsama@noreply.codeberg.org>
2023-07-15 22:56:09 +00:00
ThatOneCalculator bd57b95a97
docs: 💡 going past DB_MAX_NOTE_TEXT_LENGTH 2023-07-15 15:32:39 -07:00
ThatOneCalculator 49b0a52f9f
fix: 🔧 max post length 100000
Pleroma doesn't accept >100K (ref: https://blob.cat/objects/82f33d96-534f-45ee-902a-f77c2723db8b)
2023-07-15 14:50:23 -07:00
ThatOneCalculator e1b8532cd8
Merge branch 'develop' of codeberg.org:calckey/calckey into develop 2023-07-15 14:22:36 -07:00
ThatOneCalculator d64389543c
fix: 🔒 prevent potential SSRF through media proxy 2023-07-15 14:13:21 -07:00
freeplay e74af25d16 fix: move nowrap to proper place 2023-07-15 15:26:15 -04:00
freeplay 83294c6c3d fix: note detailed tabs using wrong styling 2023-07-15 15:21:33 -04:00
ThatOneCalculator 9c2264fb8e
fix: 🐛 allow up to 1024 chars for SMTP login
Closes #10472
2023-07-15 00:19:09 -07:00
ThatOneCalculator 63b3666b71
chore: 🎨 format 2023-07-15 00:06:53 -07:00
ThatOneCalculator 9f38f8bbca
refactor: 🗑️ deprecate DB_MAX_NOTE_TEXT_LENGTH 2023-07-15 00:06:42 -07:00
ThatOneCalculator e3b8c05e47
docs: 📝 descriptions for notes/children+conversation endpoints 2023-07-14 23:16:50 -07:00
ThatOneCalculator c467db2ea2
refactor: ♻️ correct params for notes/children+conversion 2023-07-14 23:13:32 -07:00
ThatOneCalculator c99480529f
feat: seperate sponsors and patrons 2023-07-14 23:03:07 -07:00
ThatOneCalculator 7be2b16215
remove trailing slash 2023-07-14 18:38:53 -07:00
ThatOneCalculator f3aa965c38
chore: 🎨 format 2023-07-14 16:51:49 -07:00
ThatOneCalculator 102b57424e
Merge branch 'develop' of codeberg.org:calckey/calckey into develop 2023-07-14 16:51:31 -07:00
ThatOneCalculator 8f650e6e3a
refactor: 🚸 filter out https on recommended instances 2023-07-14 16:51:21 -07:00
naskya 6072ec92ab nowrap tab texts in MkNoteDetailed 2023-07-14 21:48:13 +00:00
freeplay 79aaf392e8 refactor: remove tinycolor from MkFolder + a11y 2023-07-14 15:31:31 -04:00
freeplay 4fde8ba470 fix: error in user card if no user desc 2023-07-14 00:25:01 -04:00
freeplay f67ea7a609 fix: Follow Request labeling
resolves #10368
2023-07-14 00:17:20 -04:00
ThatOneCalculator 133c9f775c
Revert "refactor: use blurhash-as for encoding and decoding"
This reverts commit ae059881fb.
2023-07-13 19:06:57 -07:00
ThatOneCalculator ae059881fb
refactor: use blurhash-as for encoding and decoding 2023-07-13 19:00:26 -07:00
ThatOneCalculator 17e0601a95
Merge branch 'develop' of codeberg.org:calckey/calckey into develop 2023-07-13 18:32:58 -07:00
ThatOneCalculator 2e4c30e572
chore: 🎨 format 2023-07-13 18:32:23 -07:00
Kainoa Kanter 41e5f8495e Merge pull request '[PR]: User card design' (#10486) from Freeplay/calckey:user-cards into develop
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/10486
2023-07-14 00:55:57 +00:00
ThatOneCalculator 361873c6f4
chore: 🎨 format 2023-07-13 17:52:23 -07:00
ThatOneCalculator cd5c4ff191
refactor: ♻️ no autobind 2023-07-13 17:52:19 -07:00
ThatOneCalculator be67a5e599
fix: 💄 mkdonation bg 2023-07-13 17:38:44 -07:00