limepotato/akkoma
1
0
Fork 0
Code Pull requests Activity
14792 commits 27 branches 107 tags 315 MiB
Commit graph

731 commits

Author SHA1 Message Date
floatingghost
456c97fda9 Merge pull request 'remove unneeded function' (#143) from compile-fix into develop 
Reviewed-on: https://akkoma.dev/AkkomaGang/akkoma/pulls/143
 2022-08-03 11:12:05 +00:00
FloatingGhost
359510eebc remove unneeded function 2022-08-03 11:50:48 +01:00
Tusooa Zhu
f08241c8ab
Allow users to create backups without providing email address 
Ref: backup-without-email
 2022-08-02 22:16:54 -04:00
floatingghost
c9600dbbbf local-only-fixed (#138) 
Reviewed-on: https://akkoma.dev/AkkomaGang/akkoma/pulls/138
 2022-08-02 14:46:46 +00:00
floatingghost
ca000f8301 Merge mrf_simple-reject with quarantine (#137) 
Reviewed-on: https://akkoma.dev/AkkomaGang/akkoma/pulls/137
 2022-08-02 14:19:24 +00:00
Joel Beckmeyer
e26388a01c Support reaching user@sub.domain.tld at user@domain.tld (#134) 
Reviewed-on: https://akkoma.dev/AkkomaGang/akkoma/pulls/134
Co-authored-by: Joel Beckmeyer <joel@beckmeyer.us>
Co-committed-by: Joel Beckmeyer <joel@beckmeyer.us>
 2022-08-02 13:54:22 +00:00
floatingghost
c3eea8dc7d expose bubble instances via nodeinfo (#136) 
Reviewed-on: https://akkoma.dev/AkkomaGang/akkoma/pulls/136
 2022-08-02 09:11:22 +00:00
floatingghost
19a27ff006 allow small/center tags in misskeymarkdown (#132) 
Reviewed-on: https://akkoma.dev/AkkomaGang/akkoma/pulls/132
 2022-08-01 12:46:52 +00:00
Yukkuri
38659e5610 Use uppercase HTTP HEAD method for media preview proxy request (#128) 
Reviewed-on: https://akkoma.dev/AkkomaGang/akkoma/pulls/128
Co-authored-by: Yukkuri <iamtakingiteasy@eientei.org>
Co-committed-by: Yukkuri <iamtakingiteasy@eientei.org>
 2022-07-30 21:58:14 +00:00
floatingghost
405406601f Fix emoji qualification (#124) 
Reviewed-on: https://akkoma.dev/AkkomaGang/akkoma/pulls/124
 2022-07-28 12:02:36 +00:00
floatingghost
645f0390bc Prepare for ubuntu22 murdering openssl (#120) 
Reviewed-on: https://akkoma.dev/AkkomaGang/akkoma/pulls/120
 2022-07-27 21:48:13 +00:00
floatingghost
a3501cab86 ensure quote fetching obeys max thread distance (#119) 
Reviewed-on: https://akkoma.dev/AkkomaGang/akkoma/pulls/119
 2022-07-26 17:28:47 +00:00
FloatingGhost
0a55c37182 don't error out if the featured collection has a string ID 2022-07-26 15:08:35 +01:00
floatingghost
1f6deb0ef4 include local instance in bubble timeline (#117) 
Reviewed-on: https://akkoma.dev/AkkomaGang/akkoma/pulls/117
 2022-07-26 12:22:49 +00:00
floatingghost
90c4785b89 remove public post quarantine exception (#114) 
Reviewed-on: https://akkoma.dev/AkkomaGang/akkoma/pulls/114
 2022-07-26 11:09:13 +00:00
floatingghost
1419eee5df Quote posting (#113) 
Reviewed-on: https://akkoma.dev/AkkomaGang/akkoma/pulls/113
 2022-07-25 16:30:06 +00:00
floatingghost
4c47992686 bugfix/follow-state (#104) 
Reviewed-on: https://akkoma.dev/AkkomaGang/akkoma/pulls/104
 2022-07-23 18:58:45 +00:00
floatingghost
cb6e7359af add bubble timeline (#100) 
Reviewed-on: https://akkoma.dev/AkkomaGang/akkoma/pulls/100
 2022-07-22 14:55:38 +00:00
floatingghost
0c542e58aa Remove instrumentors (#98) 
Reviewed-on: https://akkoma.dev/AkkomaGang/akkoma/pulls/98
 2022-07-21 11:32:17 +00:00
FloatingGhost
0f132b802d purge chat and shout endpoints 2022-07-21 11:29:28 +01:00
floatingghost
07ea4d73e1 update mastofe paths (#95) 
Reviewed-on: https://akkoma.dev/AkkomaGang/akkoma/pulls/95
 2022-07-20 20:13:50 +00:00
FloatingGhost
e35dced9c8 remove chat enabled feature 2022-07-20 15:46:41 +01:00
floatingghost
729f45ccd2 purge ldap authenticator (#92) 
Reviewed-on: https://akkoma.dev/AkkomaGang/akkoma/pulls/92
 2022-07-20 12:49:13 +00:00
floatingghost
dc9f66749c remove all endpoints marked as deprecated (#91) 
Reviewed-on: https://akkoma.dev/AkkomaGang/akkoma/pulls/91
 2022-07-20 12:00:58 +00:00
FloatingGhost
cf0ad02ea9 Remove scrobbling support 2022-07-19 15:07:45 +01:00
floatingghost
54ed8760ff Merge branch 'from/upstream-develop/tusooa/server-announcements' into 'develop' (#85) 
Reviewed-on: https://akkoma.dev/AkkomaGang/akkoma/pulls/85
 2022-07-18 13:08:36 +00:00
floatingghost
5b4d77eaa7 maintenance: dependency upgrade (#81) 
Reviewed-on: https://akkoma.dev/AkkomaGang/akkoma/pulls/81
 2022-07-18 00:56:35 +00:00
Tusooa Zhu
4c5bc3e9f7 Pass remote follow avatar into media proxy 2022-07-12 15:44:38 -04:00
floatingghost
8215434c65 also resolve @full@tags in mfm (#62) 
Reviewed-on: https://akkoma.dev/AkkomaGang/akkoma/pulls/62
 2022-07-11 13:48:43 +00:00
floatingghost
ff6c8455fb [#58] ensure all users are linked in MFM content (#61) 
Reviewed-on: https://akkoma.dev/AkkomaGang/akkoma/pulls/61
 2022-07-11 11:48:29 +00:00
floatingghost
5ad256f170 [#58] pre-link MFM content (#59) 
Reviewed-on: https://akkoma.dev/AkkomaGang/akkoma/pulls/59
 2022-07-10 17:06:25 +00:00
floatingghost
82fa766ed7 Remove precompiled javascript (#55) 
Reviewed-on: https://akkoma.dev/AkkomaGang/akkoma/pulls/55
 2022-07-08 13:03:18 +00:00
floatingghost
bc6bfe383f Add configurable theme color (#53) 
Reviewed-on: https://akkoma.dev/AkkomaGang/akkoma/pulls/53
 2022-07-06 20:00:43 +00:00
sfr
058bf96798 implement Move activities (#45) 
Reviewed-on: https://akkoma.dev/AkkomaGang/akkoma/pulls/45
Co-authored-by: sfr <sol@solfisher.com>
Co-committed-by: sfr <sol@solfisher.com>
 2022-07-04 16:29:39 +00:00
FloatingGhost
0a3a552696 Add support for a first reference in pinned objects 2022-07-03 17:25:20 +01:00
FloatingGhost
4da9a12bf8 Add test for friendica featured collection 2022-07-03 16:59:12 +01:00
floatingghost
a40bf8be5e Update eblurhash to a non-bugged version (#34) 
Reviewed-on: https://akkoma.dev/AkkomaGang/akkoma/pulls/34
 2022-07-02 14:05:32 +00:00
floatingghost
3f7c64f30b Fix broken attachments from owncast (#31) 
Reviewed-on: https://akkoma.dev/AkkomaGang/akkoma/pulls/31
 2022-07-01 11:14:55 +00:00
FloatingGhost
1ecdb19de5 Refactor ES on top of search behaviour 2022-06-30 16:28:31 +01:00
Hélène
8f140deb8f StealEmojiPolicy: fix String rejected_shortcodes 
* rejected_shortcodes is defined as a list of strings in the
  configuration description. As such, database-based configuration was
  led to handle those settings as strings, and not as the actually
  expected type, Regex.
* This caused each message passing through this MRF, if a rejected
  shortcode was set and the emoji did not exist already on the instance,
  to fail federating, as an exception was raised, swiftly caught and
  mostly silenced.
* This commit fixes the issue by introducing new behavior: strings are
  now handled as perfect matches for an emoji shortcode (meaning that if
  the emoji-to-be-pulled's shortcode is in the blacklist, it will be
  rejected), while still supporting Regex types as before.
 2022-06-29 20:47:45 +01:00
Ilja
661d0ba481 Also use actor_type to determine if an account is a bot in antiFollowbotPolicy 2022-06-29 20:47:44 +01:00
Tusooa Zhu
33d821256e Fix incorrect fallback when English is set to first language 2022-06-29 20:47:10 +01:00
Ilja
e3107fee98 Fix eratic test for POST /api/pleroma/admin/reports/:id/notes 
It retrieved two ReportNotes and then checked one of them. But the order isn't guaranteed, while the test tested on the content of the first ReportNote.

I made the test on the content more generic
 2022-06-29 20:47:10 +01:00
Tusooa Zhu
2df25e6666 Support fallbacking to other languages 2022-06-29 20:47:10 +01:00
Tusooa Zhu
fcfb5a4967 Lint 2022-06-29 20:47:10 +01:00
Tusooa Zhu
07bd35227a Support multiple locales from userLanguage cookie 2022-06-29 20:47:10 +01:00
Tusooa Zhu
fa95bc8725 Support multiple locales formally 
elixir gettext current does not fully support fallback to another language [0].
But it might in the future. We adapt it so that all languages in Accept-Language
headers are received by Pleroma.Web.Gettext. User.languages is now a comma-separated
list.

[0]: https://github.com/elixir-gettext/gettext/issues/303
 2022-06-29 20:47:10 +01:00
Tusooa Zhu
ff0bb3a3ac Add test for fallbacking to a general language 2022-06-29 20:47:10 +01:00
Tusooa Zhu
ef73f61b07 Fallback to a variant if the language in general is not supported 
For an example, here, zh is not supported, but zh_Hans and zh_Hant
are. If the user asks for zh, we should choose a variant for them
instead of fallbacking to default.

Some browsers (e.g. Firefox) does not allow users to customize
their language codes. For example, there is no zh-Hans, but only
zh, zh-CN, zh-TW, zh-HK, etc. This provides a workaround for
those users suffering from bad design decisions.
 2022-06-29 20:47:10 +01:00
Tusooa Zhu
72bdb0640f Allow user to register with custom language 2022-06-29 20:46:51 +01:00
Tusooa Zhu
775f997c40 Prefer userLanguage cookie over Accept-Language header in detecting locale 
https://git.pleroma.social/pleroma/pleroma-meta/-/issues/60
 2022-06-29 20:43:41 +01:00
Ilja
8b843be03e Fix test get_user_apps/1 
For some reason I had a test who suddenly failed, mix test test/pleroma/web/o_auth/app_test.exs:54. A user has a list of applications and this test adds them and then sees if the list it gets back is the same as the apps it added.

When I ran mix test a day before I didn't have this problem and when I pushed code today in a different MR, the pipeline succeeded (see https://git.pleroma.social/ilja/pleroma/-/jobs/205827), yet locally it failed. So it seems the test can sometimes succeed and sometimes fail, which makes it untrustworthy.

The failure I see is because the returned list is in reverse order. I assume that's not per sé wrong. You just want to know if the apps you added are actually there. I fixed the test by first ordering the lists before comparing.

AFAICT (and as far as that's relevant) the test got introduced in commit cb2a072e62
 2022-06-29 20:43:41 +01:00
floatingghost
2342fface1 Add visibility check in context path (#26) 
Reviewed-on: https://akkoma.dev/AkkomaGang/akkoma/pulls/26
 2022-06-29 09:33:57 +00:00
FloatingGhost
cac39ef817 Bugfix: standardise scheme for emoji reactions 2022-06-25 15:27:46 +01:00
FloatingGhost
cad4ba2ab3 mix format 2022-06-22 17:20:55 +01:00
FloatingGhost
3928cecf6b ensure local statuses are not visible remotely 2022-06-22 17:06:40 +01:00
FloatingGhost
502382da45 cherry-pick security from upstream 2022-06-22 16:25:05 +01:00
sn0w
f2f8b81fc4
Use mediaproxy for emoji notifications if enabled 2022-06-17 14:27:22 +02:00
FloatingGhost
af1bd3af59 mix format 2022-06-14 17:43:45 +01:00
FloatingGhost
6e1d9c63da allow %{source} dict in no_empty 2022-06-14 17:41:25 +01:00
FloatingGhost
abefbcec64 Merge branch 'mfm' into develop 2022-06-14 16:25:47 +01:00
FloatingGhost
829ae13572 ensure tests pass 2022-06-14 16:24:03 +01:00
sn0w
60bfaed368
Allow reacting with emojis containing a number 2022-06-14 11:47:09 +02:00
FloatingGhost
0f5bea2465 Add emoji_url to notifications to allow rendering 
Ref #5
 2022-06-12 13:35:14 +01:00
FloatingGhost
2abf8c982e fix secret key failure 2022-06-11 16:48:04 +01:00
FloatingGhost
24bf8c3977 mix format 2022-06-11 16:14:31 +01:00
FloatingGhost
32fbd2e4e3 fix all tests 2022-06-11 16:14:22 +01:00
FloatingGhost
c3ed86cd1e fix emoji controller tests 2022-06-11 14:21:50 +01:00
FloatingGhost
142646426e fix emoji tests 2022-06-11 14:08:54 +01:00
FloatingGhost
0f6bece60d Merge remote-tracking branch 'origin/patch/readd-mastofe' into develop 2022-01-08 21:45:12 +00:00
FloatingGhost
0d012ebea1 Revert "Merge branch 'remove/mastofe' into 'develop'" 
This reverts commit 6b3842cf50, reversing
changes made to 6b1282a829.
 2022-01-08 21:44:37 +00:00
FloatingGhost
8cc6359a85 Merge remote-tracking branch 'upstream/bookwyrm-entities' into develop 2022-01-07 20:23:53 +00:00
FloatingGhost
25b4395830 just drop unknown tags 2022-01-07 20:14:04 +00:00
FloatingGhost
92d3742072 Merge remote-tracking branch 'upstream/bookwyrm-entities' into develop 2022-01-07 17:21:44 +00:00
FloatingGhost
9ee27fb5ec add bookwyrm entity tests 2022-01-07 17:17:18 +00:00
FloatingGhost
680c5d8d89 Add compatibility with bookwyrm's weird entities 2022-01-07 16:51:04 +00:00
Alex Gleason
2ae867842b
StreamerTest: tag erratic test 2021-12-31 10:29:50 -06:00
FloatingGhost
12a171844b Merge remote-tracking branch 'upstream/develop' into develop 2021-12-30 18:05:22 +00:00
marcin mikołajczak
746c9daa62 Merge remote-tracking branch 'pleroma/develop' into mastodon-lookup 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2021-12-28 16:27:27 +01:00
marcin mikołajczak
f734579965 MastoAPI: Add GET /api/v1/accounts/lookup 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2021-12-28 16:11:17 +01:00
Alex Gleason
5c80d4087d
PleromaAPI.AppView: add test 2021-12-27 18:52:34 -06:00
Alex Gleason
cb2a072e62
Apps: add test for get_user_apps/1 2021-12-27 18:29:03 -06:00
Alex Gleason
2e4a1c56c3
AppController: test creating with and without a user 2021-12-27 18:14:15 -06:00
Alex Gleason
f5c3d45120
Merge remote-tracking branch 'origin/develop' into apps-api-endpoint 2021-12-27 18:01:25 -06:00
Alex Gleason
479fc5fff8
EnsureStaffPrivilegedPlug: add tests 2021-12-27 10:39:59 -06:00
Alex Gleason
913141379c Merge branch 'profile-directory' into 'develop' 
MastoAPI: Profile directory

See merge request pleroma/pleroma!3573
 2021-12-26 02:35:17 +00:00
marcin mikołajczak
de006443f0 MastoAPI: Profile directory 2021-12-26 02:35:17 +00:00
Alex Gleason
2c06eff519
Pleroma.Web.base_url() --> Endpoint.url() 2021-12-25 20:11:14 -06:00
Alex Gleason
db2bf55e9b
Merge remote-tracking branch 'origin/develop' into notice-routes 2021-12-25 19:57:53 -06:00
Alex Gleason
73609211a4 Merge branch 'account-notes' into 'develop' 
MastoAPI: Add user notes on accounts

See merge request pleroma/pleroma!3540
 2021-12-25 01:41:12 +00:00
Alex Gleason
b96a58ff28 Merge branch 'account-subscriptions' into 'develop' 
MastoAPI: accept notify param in follow request

See merge request pleroma/pleroma!3555
 2021-12-25 01:34:27 +00:00
Alex Gleason
d9746ae4cb Merge branch 'from/develop/tusooa/2802-propagate-reject' into 'develop' 
Handle Reject for already-accepted Follows properly

Closes #2766 and #2802

See merge request pleroma/pleroma!3568
 2021-12-23 16:00:16 +00:00
Alex Gleason
9c1cb87eff Merge branch 'erratic-tests' into 'develop' 
Skip erratic tests

See merge request pleroma/pleroma!3572
 2021-12-22 04:14:31 +00:00
Alex Gleason
2ce7dae6de
Skip erratic tests 2021-12-21 22:04:15 -06:00
Alex Gleason
b0d2b53934 Merge branch 'manifest' into 'develop' 
Expose /manifest.json for PWA

Closes #882

See merge request pleroma/pleroma!3544
 2021-12-19 18:18:59 +00:00
Alex Gleason
1ff9ffed83 Merge branch 'live-dashboard' into 'develop' 
Add Phoenix LiveDashboard

See merge request pleroma/pleroma!3566
 2021-12-19 17:35:14 +00:00
Alex Gleason
e4f9cb1c1b
Merge remote-tracking branch 'origin/develop' into manifest 2021-12-19 11:33:10 -06:00
Alex Gleason
bd853199d9 Merge branch 'v2-suggestions' into 'develop' 
V2 suggestions

See merge request pleroma/pleroma!3547
 2021-12-19 17:31:17 +00:00
Tusooa Zhu
8376e83f61
Lint 2021-12-17 16:52:50 -05:00
Tusooa Zhu
951d1592c7
Add test to ensure removed follower cease to have relationship with ex-followee 
https://git.pleroma.social/pleroma/pleroma/-/issues/2802
 2021-12-17 16:44:22 -05:00