dakkar
6ecfe7c7c3
remove duplicate method
2024-03-02 17:34:31 +00:00
dakkar
23f476dbf3
Merge branch 'develop' into release/2024.3.1
2024-03-02 17:28:34 +00:00
dakkar
af548d05ca
merge upstream for 2024.2.1
2024-03-02 16:36:49 +00:00
Marie
15d2319011
merge: upstream
2024-02-23 13:42:52 +01:00
tamaina
600d91beda
enhance: リモートのフォロワーから再度Followが来た場合、acceptを返してあげる ( #13388 )
...
* enhance: リモートのフォロワーから再度Followが来た場合、acceptを返してあげる
* nanka meccha kaeta
* ブロックチェックの後にフォロー関係の存在チェックをする
2024-02-23 18:04:30 +09: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
Marie
10bfc61670
merge: upstream
2024-02-19 10:47:42 +01:00
Marie
8f6dfa611e
fix: keep alt text of file if present
2024-02-13 22:01:53 +00:00
tamaina
c1514ce91d
(re) update SPDX-FileCopyrightText
...
Fix #13290
2024-02-13 15:59:27 +00:00
tamaina
311c2172d7
Revert "update SPDX-FileCopyrightText"
...
This reverts commit 9b5aeb76d8
2024-02-13 15:50:11 +00:00
syuilo
9b5aeb76d8
update SPDX-FileCopyrightText
2024-02-12 11:37:45 +09:00
dakkar
4bc517ca89
import fs/promises the right way
...
thanks Marie
2024-02-03 12:55:56 +00:00
dakkar
bb3694bfed
lint
2024-02-03 12:55:46 +00:00
dakkar
1bb5021c54
decode entity references from tweets
...
apparently *some* tweets have those ☹
2024-02-03 12:05:08 +00:00
dakkar
a981bca7a3
simpler logic
...
thanks Alina
2024-02-03 11:37:20 +00:00
dakkar
3a3a051bb5
make almost all fs ops async
...
there's no `fs.promises.exists`
2024-02-03 11:33:42 +00:00
dakkar
7684f45a5e
simpler mapping
...
thanks Alina
2024-02-03 11:30:39 +00:00
dakkar
25948c9232
simpler json-isation
...
thanks Alina for the suggestion
2024-02-03 11:29:46 +00:00
Amelia Yukii
a6e257f502
Merge branch 'feture/code-injection-fix' into 'develop'
...
CVE: Fixed code injection from twitter import
See merge request TransFem-org/Sharkey!390
(cherry picked from commit 127f8556d42a8e93e4
2024-02-01 15:07:35 +00:00
KevinWh0
2a8e93e4be
Fixed code injection from twitter import
2024-02-01 15:58:50 +01:00
dakkar
b77c025245
link twitter names to twitter, not nitter #382
...
nitter seems very dead
2024-01-28 16:06:16 +00:00
Marie
913dd581ef
merge: upstream
2024-01-25 14:21:42 +01:00
syuilo
65557d5f27
enhance(reversi): more robust matching process
2024-01-24 10:16:05 +09:00
Marie
7552cea69a
merge: upstream
2024-01-09 02:57:57 +01:00
Kagami Sascha Rosylight
2a9db983fc
feat: export clips ( #12931 )
...
* feat: export clips
* Update CHANGELOG.md
2024-01-07 10:35:58 +09:00
riku6460
24645e3d3d
enhance(backend): ActivityPub 周りで連合先から HTTP 429 Too Many Requests を受け取った際にジョブをリトライするように ( #12917 )
...
* enhance(backend): ActivityPub 周りで HTTP 429 Too Many Requests を受け取った際にリトライするように
* add to changelog
---------
Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
2024-01-06 09:40:08 +09:00
MeiMei
d415fd29a3
enhance(backend): ActivityPub Deliver queueでBodyを事前処理するように ( #12916 )
...
* Pre-processing deliver body
* CHANGELOG
* ループ内で計算されると意味がないので
* 同じ処理を同じ形に
---------
Co-authored-by: まっちゃとーにゅ <17376330+u1-liquid@users.noreply.github.com>
2024-01-06 09:07:48 +09:00
Marie
1805150533
fix: visibility check on masto import
...
Originally from PR #288
2023-12-31 22:41:35 +01:00
Marie
233eff48f3
merge: pleroma note import - Use hashed filename for exists check ( #283 )
...
Reviewed-on: https://git.joinsharkey.org/Sharkey/Sharkey/pulls/283
2023-12-31 18:43:38 +01:00
smitten
8d6d5923da
Simplify hash steps
2023-12-31 11:14:41 -05:00
smitten
327694d4cf
Use base64url digest
2023-12-31 09:13:51 -05:00
smitten
e9428a5a05
Use hex digest
2023-12-31 09:03:46 -05:00
Marie
b700fadbe3
upd: add home as a visibility for mastodon imports
2023-12-31 06:32:39 +01:00
Marie
07f06d7ed6
fix: if condition
2023-12-31 04:09:44 +01:00
Marie
fc6581b948
fix: correct followers visibility on import
2023-12-31 03:50:05 +01:00
Marie
667daebb79
upd: prevent vanilla mastodon imports from importing DMs
...
Also adds the visibility function to mastodon imports
2023-12-31 03:48:51 +01:00
smitten
0bb0d69543
Use hashed filename for exists check
2023-12-30 20:44:31 -05: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
Mar0xy
62bcd42891
upd: create Folders for imported media
2023-11-28 22:46:10 +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
19fc5a74f0
merge: improve recreateChain
...
Resolves #159
2023-11-18 12:38:13 +01:00
Mar0xy
4929467016
upd: import own replies to own tweets
2023-11-17 20:10:16 +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
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
