Commit graph

4597 commits

Author SHA1 Message Date
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
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
Insert5StarName
97bd4e6f82 chore: add locales for defaultLike 2023-11-30 13:25:35 +01: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
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
Mar0xy
65a2ea6a74
upd: improve post editing on polls
Fixes not being able to edit post if poll expiry was set and now checks properly if poll was edited or not
2023-11-30 02:11:47 +01:00
Mar0xy
363bb43658
upd: remove quote button restriction and coloring 2023-11-29 22:26:56 +01:00
Mar0xy
5f7fc54ee9
upd: delete emoji file from drive on emoji deletion 2023-11-29 18:45:42 +01:00
Marie
5f3754f9fc
merge: fix classic ui sidebars not sticking 2023-11-29 02:45:41 +01:00
Mar0xy
62bcd42891
upd: create Folders for imported media 2023-11-28 22:46:10 +01:00
Insert5StarName
c483a75337 use locale 2023-11-28 22:21:40 +01:00
Mar0xy
ae2752ca0f upd: ask to reload on like change 2023-11-28 22:21:40 +01:00
Mar0xy
c9112b2949 upd: use null as default on user like setting 2023-11-28 22:21:40 +01:00
Mar0xy
44fe3e4ebb
fix: quoted notes opening when clicking CW button 2023-11-28 13:03:53 +01:00
Insert5StarName
fe7528a8ee remove background from widgets 2023-11-28 12:42:15 +01:00
Insert5StarName
e14fd33140 fix: classic ui 2023-11-28 12:38:34 +01:00
Mar0xy
7e2cf4238f
upd: apply 300x300 PWA icon
Closes transfem-org/Sharkey#165
2023-11-28 03:48:22 +01:00
Mar0xy
d135cba60b
chore: lint 2023-11-28 03:05:33 +01:00
Mar0xy
7722c0045a
chore: correct class from undone changes 2023-11-28 03:03:13 +01:00
Mar0xy
bd470596cc
upd: collapse mentions if multiple are followed in a row 2023-11-28 03:01:37 +01:00
Mar0xy
13e8269993
upd: unset overscroll-behavior on universal 2023-11-28 02:07:50 +01:00
Mar0xy
7b9c16487b
upd: add fields to user popup
Closes transfem-org/Sharkey#173
2023-11-27 23:35:18 +01:00
Mar0xy
958b97a50c
upd: add ability to open remote profile in user dropdown
Closes transfem-org/Sharkey#176
2023-11-27 22:17:03 +01:00
Mar0xy
3d0b754332
fix: selecting text in a note causing it to open
Closes transfem-org/Sharkey#175
2023-11-27 22:06:25 +01:00
dakkar
d50d335e44 re-fix "hide preview of quote-renote"
I'm not sure how this got lost
2023-11-26 16:03:23 +00:00
Marie
5131a3414d
fix: correct acctUri 2023-11-25 21:02:41 +01:00
Marie
a5fccab128
upd: provide uri on accounts 2023-11-25 20:59:21 +01:00
Mar0xy
7ba8529141
fix: importing remote emojis with used name
Closes transfem-org/Sharkey#164
2023-11-24 18:19:01 +01:00
Mar0xy
04dbf7ebe9
chore: replace icons, change errors 2023-11-23 19:22:34 +01:00
Mar0xy
42bf8e5e76
merge: upstream 2023-11-22 23:40:27 +01:00
Mar0xy
81c36908d9
fix: attachments not working on FB import 2023-11-22 19:02:43 +01:00
Mar0xy
d078a72f38
upd: add Facebook to note importing 2023-11-22 16:00:46 +01:00
Mar0xy
cb9cbc8f15
chore: remove unused type 2023-11-21 22:23:55 +01:00
Mar0xy
3f86903cae
upd: use Meilisearch for file type searching 2023-11-21 22:23:01 +01:00
Mar0xy
733c9a8c00
fix: Show Less button overlapping text
Fixes transfem-org/Sharkey#161
2023-11-20 22:55:37 +01:00
Mar0xy
19fc5a74f0
merge: improve recreateChain
Resolves #159
2023-11-18 12:38:13 +01:00
Insert5StarName
88d9f59957 upd: highlight active tab text 2023-11-18 05:17:00 +01:00
Mar0xy
4929467016
upd: import own replies to own tweets 2023-11-17 20:10:16 +01:00
Mar0xy
13600e0abc
upd: keep choice in indexable migration update 2023-11-17 15:17:47 +01:00
Mar0xy
55ef4c4d93
upd: completely change handling of indexable 2023-11-17 15:05:58 +01:00
Mar0xy
902e5a81f9
fix: pinned being set to null causing errors in masto api 2023-11-17 14:05:36 +01:00
Mar0xy
2267f5a619
upd: change indexable value to noindex
As described in https://docs.joinmastodon.org/entities/Account/#noindex
2023-11-17 13:58:06 +01:00
Mar0xy
1a78ed400c
upd: remove event stream calls on import 2023-11-17 13:49:12 +01:00
syuilo
08b3662bb8 chore(frontend): tweak ui 2023-11-17 18:00:42 +09:00
syuilo
4a7ccf6deb tweak MkTime.vue 2023-11-17 17:54:13 +09:00
syuilo
4b3f9bd9a6 enhance(backend): MFMのunixtimeをISO形式で連合するように 2023-11-17 15:44:36 +09:00
syuilo
5f5712a3ee fix(frontend): MFM unixtimeのプレビューがリアルタイムで反映されない
Fix #12350
2023-11-17 15:33:57 +09:00
syuilo
4f9922d46c update deps 2023-11-17 15:10:04 +09:00
syuilo
a9a743dab9 enhance(frontend): MFMでUNIX時間を指定して日時を表示できるように
Resolve #12294
2023-11-17 15:05:37 +09:00
syuilo
4d1a2bad17 typo 2023-11-17 13:27:33 +09:00
syuilo
cbab3affc9
Update packages/frontend/src/pages/role.vue
Co-authored-by: Acid Chicken (硫酸鶏) <root@acid-chicken.com>
2023-11-17 13:26:55 +09:00
syuilo
f89a827aa9
Update packages/frontend/src/pages/role.vue
Co-authored-by: Acid Chicken (硫酸鶏) <root@acid-chicken.com>
2023-11-17 13:26:48 +09:00
syuilo
43cb2d478c enhance(frontend): ruby内でMFMを使えるように 2023-11-17 13:20:40 +09:00
syuilo
b517d76084 enhance(frontend): MFMでルビを振れるように
Resolve #9161
2023-11-17 13:09:56 +09:00
Mar0xy
a3fd51d6e0
upd: change the way likes get handled 2023-11-16 23:47:44 +01:00
Mar0xy
5af274ef0a
upd: register contentParser 2023-11-16 20:21:33 +01:00
Mar0xy
67dceab22e
fix: errors 2023-11-16 20:08:16 +01:00
Mar0xy
2fae63fe15
upd: add multipart support to oauth/token 2023-11-16 20:04:19 +01:00
Mar0xy
6ca27b48cf
upd: add multipart/form support to a few mastodon endpoints 2023-11-16 19:45:54 +01:00
おさむのひと
1eb769dbe8
LTLに特定条件下でチャンネル投稿が混ざり込む現象の修正 (#12347)
* LTLにチャンネル投稿を含まないように修正

* fix CHANGELOG.md

---------

Co-authored-by: osamu <46447427+sam-osamu@users.noreply.github.com>
2023-11-16 16:02:46 +09:00
syuilo
9d78a1a8b3 enhance(backend): make ftt db fallback configurable 2023-11-16 10:20:57 +09:00
Mar0xy
5c0d63d493
upd: style of buttons for user like setting 2023-11-16 00:29:54 +01:00
Mar0xy
490b249407
upd: Allow users to change default like emoji
When users change the default like emoji in reactions tab from heart to another one it will be send out as that specific emoji.

If reset back to heart it will default to the instance like emoji again which is heart by default.

Closes transfem-org/Sharkey#95
2023-11-16 00:22:12 +01:00
Mar0xy
62bb0d1eaa
upd: add option to disable server disconnect warning
Closes transfem-org/Sharkey#152
2023-11-15 23:59:29 +01: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
おさむのひと
38d6580a36
通知音などの発音方法を変え、iOSで音声出力が競合しないようにする (#12339)
* HTMLAudioElementを使わないようにする

* fix CHANGELOG.md

---------

Co-authored-by: osamu <46447427+sam-osamu@users.noreply.github.com>
2023-11-15 18:03:15 +09: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
おさむのひと
96f1728573
fix: 表示済みのカラムから別のチャンネルを選択した時、タイムラインの内容が追従して変更されない問題に対処 (#12237)
* 表示済みのカラムから別のチャンネルを選択した時、タイムラインの内容が追従して変更されない問題に対処

* fix CHANGELOG.md

* fix code style

* Update MkTimeline.vue

* コメント対応(MkButtonのimportとonBeforeUpdate->watch)

* fix CHANGELOG.md

* Update MkPagination.vue

---------

Co-authored-by: osamu <46447427+sam-osamu@users.noreply.github.com>
Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
2023-11-15 11:24:54 +09:00
atsuchan
6cc0685f2a
Fix(frontend): サーバーサイレンス (#12292) 2023-11-15 11:14:27 +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
3939360e55 fix(frontend): 特定の条件下でノートがnyaizeされない問題を修正
Fix #12331
2023-11-15 11:09:54 +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
Nya Candy
1361bdfbf2
fix: test break caused by #12273 (#12322)
* fix

* fix: websocket stream origin
2023-11-13 16:39:54 +09:00
atsuchan
31174d6b79
Fix(frontend): role users/timeline visiable ui (#12305) 2023-11-13 13:31:18 +09:00
Srgr0
c541ced3ab
非ログイン時に「メモを追加」を表示しない (#12310)
* Update home.vue

* Update CHANGELOG.md
2023-11-13 10:25:52 +09: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
d2e403a4bd
fix: NoteDetailed using wrong value 2023-11-12 22:53:06 +01:00
Mar0xy
430a96ebdb
fix: like not being set 2023-11-12 22:40:33 +01:00
Mar0xy
f0a2ce00e7
chore: lint 2023-11-12 22:27:57 +01: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