Commit graph

26351 commits

Author SHA1 Message Date
Marie
f93a8e2d38 merge: Fix sfm-js linkage (!399)
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/399

Approved-by: Amelia Yukii <amelia.yukii@shourai.de>
Approved-by: dakkar <dakkar@thenautilus.net>
2024-02-03 18:28:47 +00:00
Marie
d3d0e510d8 merge: DeepLX-JS support (!396)
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/396

Closes #324

Approved-by: Amelia Yukii <amelia.yukii@shourai.de>
Approved-by: dakkar <dakkar@thenautilus.net>
2024-02-03 17:54:59 +00:00
Marie
65a1bc2199
upd: add i18n 2024-02-03 18:49:41 +01:00
Marie
469c3f3f1a
upd: remove https 2024-02-03 18:41:47 +01:00
Marie
75bce2228f merge: some fixes to NoteEdit and muting (!376)
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/376

Approved-by: Amelia Yukii <amelia.yukii@shourai.de>
Approved-by: Luna <her@mint.lgbt>
Approved-by: Marie <marie@kaifa.ch>
2024-02-03 17:25:17 +00:00
Marie
65a7623944 merge: follow-up to !390 (!397)
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/397

Approved-by: Amelia Yukii <amelia.yukii@shourai.de>
Approved-by: Marie <marie@kaifa.ch>
2024-02-03 17:05:21 +00:00
Amelia Yukii
b2d520369f merge: Temp redirect until Join Sharkey dot Org is up. (!400)
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/400

Closes #392

Approved-by: Amelia Yukii <amelia.yukii@shourai.de>
Approved-by: dakkar <dakkar@thenautilus.net>
2024-02-03 16:32:47 +00:00
Leah
441523b6d4 merge: Added lines and line numbers to syntax errors (!395)
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/395

Approved-by: dakkar <dakkar@thenautilus.net>
2024-02-03 16:05:33 +00:00
Adam Howard
fc06494908 Temp redirect until Join Sharkey dot Org is up. 2024-02-03 16:03:09 +00:00
Marie
f091b84c6e
chore: change sfm registry and name 2024-02-03 15:01:09 +01: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
Marie
83f1c596b0
upd: add caption to deeplx url input 2024-02-03 09:19:00 +01:00
KevinWh0
93bd4dc8fe added lines and lines to errors 2024-02-02 21:32:08 +01:00
Amelia Yukii
990e53fee4 Merge branch 'chore/updateMarkdownAndTemplates' into 'develop'
chore: update CI, Markdown and some Templates

See merge request TransFem-org/Sharkey!392
2024-02-02 16:46:24 +00:00
Amelia Yukii
ea44895b6b Merge branch 'oneko' into 'develop'
feat: oneko

See merge request TransFem-org/Sharkey!387
2024-02-02 11:59:43 +00:00
ShittyKopper
2e0557c90c upd: lazy load SkOneko on demand 2024-02-02 14:56:58 +03:00
Amelia Yukii
aabf168d05 Merge branch 'fix/image-csp' into 'develop'
fix: Add default error image domain to dev mode CSP

See merge request TransFem-org/Sharkey!391
2024-02-02 11:35:03 +00:00
Amelia Yukii
6516370251 Update 13 files
- /.forgejo/workflows/docker-develop.yml
- /.forgejo/workflows/docker.yml
- /.forgejo/workflows/lint.yml
- /.gitea/ISSUE_TEMPLATE/01_bug-report.yml
- /.gitea/ISSUE_TEMPLATE/02_feature-request.yml
- /.gitea/ISSUE_TEMPLATE/config.yml
- /.gitea/pull_request_template.md
- /.gitlab-ci.yml
- /.old/workflows/lint.yml
- /.gitlab/issue_templates/feature.md
- /.gitlab/issue_templates/bug.md
- /.gitlab/merge_request_templates/default.md
- /SECURITY.md
2024-02-02 07:48:35 +00:00
Essem
e3f25a84df
fix: Add default error image domain to CSP 2024-02-01 17:29:13 -06:00
Amelia Yukii
fb455e4fd9 version is better 2024-02-01 15:59:14 +00:00
Amelia Yukii
8c5818acf0 Update .gitlab-ci.yml 2024-02-01 15:45:42 +00:00
Amelia Yukii
127f8556d4 Merge branch 'feture/code-injection-fix' into 'develop'
CVE: Fixed code injection from twitter import

See merge request TransFem-org/Sharkey!390
2024-02-01 15:06:21 +00:00
KevinWh0
2a8e93e4be Fixed code injection from twitter import 2024-02-01 15:58:50 +01:00
Amelia Yukii
fbd1156426 Merge branch 'update-compose' into 'develop'
update images

See merge request TransFem-org/Sharkey!388
2024-02-01 14:38:56 +00:00
Amelia Yukii
282118e597 update images 2024-02-01 14:36:48 +00:00
ShittyKopper
132bf2d200 feat: oneko 2024-02-01 17:31:04 +03:00
Amelia Yukii
2811f4cca5 Merge branch 'ci-branch' into 'develop'
Run testCommit on Merge requests

See merge request TransFem-org/Sharkey!384
2024-02-01 12:51:52 +00:00
Amelia Yukii
3af7583159 Update file .gitlab-ci.yml 2024-02-01 12:49:02 +00:00
Amelia Yukii
522ab39db8 Merge branch 'gitlab-ci' into 'develop'
Gitlab CI

See merge request TransFem-org/Sharkey!382
2024-02-01 10:09:57 +00:00
Amelia Yukii
c203ef7a44 Gitlab CI 2024-02-01 10:09:57 +00:00
Amelia Yukii
5ea0ef8587 Update README.md 2024-01-31 14:57:57 +00:00
dakkar
b77c025245 link twitter names to twitter, not nitter #382
nitter seems very dead
2024-01-28 16:06:16 +00:00
Marie
074c47fdf8
upd: misskey-js api definitions 2024-01-26 21:31:14 +01:00
Marie
c6e3ec07d1
add: DeepLX-JS support
Closes #324
2024-01-26 21:29:38 +01:00
dakkar
e93e73673a probably more correct muting logic
we want to notify if neither the thread nor the user are muted;
otherwise, for example, notes in a muted thread from a non-muted user
would get notified
2024-01-26 18:09:25 +00:00
dakkar
b0fcc11d9e null-ify text after trimming
this comes from upstream, it's already present in the "import"
section, I think it was missed in a merge
2024-01-26 18:07:49 +00:00
dakkar
83e9057b27 apply to NoteEditService all recent changes from NoteCreateService 2024-01-26 18:07:34 +00:00
Marie
e5c060eecf
fix: don't show mentions and boosts towards muted user posts in timeline
Closes #336
2024-01-26 01:59:19 +01:00
Marie
c8c505fb92
fix: allow viewing of muted users posts
This would allow admins and mods to see muted users posts as well as normal users to view them if they ever get a link sent to them.
2024-01-26 01:39:53 +01:00
Marie
47cf7f6822
fix: don't show replies to muted users in timelines
Closes #337
2024-01-26 01:39:01 +01:00
Marie
6c6ccdc1e0
fix: properly mute notifications when mentioned by muted users
Closes #339
2024-01-26 01:24:26 +01:00
Marie
1bec69df16
fix: reactions being shown on muted/blocked users
Closes #342
2024-01-26 01:00:12 +01:00
Marie
4be70a8d98
fix: boost being available on DMs on detailed view
Closes #346
2024-01-26 00:56:09 +01:00
Marie
e89f4ff3c8
fix: boosts not being muted when muting thread
Closes #347
2024-01-25 19:39:41 +01:00