aa681d7e15
Fix oauth2 (for real) ( #179 )
...
Reviewed-on: AkkomaGang/akkoma#179
2022-08-21 16:24:37 +00:00
b0130bfa7b
Revert "oauth2 fixes ( #177 )"
...
This reverts commit 429e2ac832
.
2022-08-21 16:22:15 +01:00
d72f9e39d9
add visibility check on quote ( #178 )
...
Reviewed-on: AkkomaGang/akkoma#178
2022-08-21 15:17:01 +00:00
429e2ac832
oauth2 fixes ( #177 )
...
Reviewed-on: AkkomaGang/akkoma#177
2022-08-21 14:46:52 +00:00
e9f1897cfd
parser MFM server-side ( #172 )
...
Reviewed-on: AkkomaGang/akkoma#172
2022-08-18 03:14:48 +00:00
aaf78e2b52
only put linked mfm in source ( #171 )
...
Reviewed-on: AkkomaGang/akkoma#171
2022-08-17 09:35:11 +00:00
11ec9daa5b
API compatibility with fedibird, frontend config ( #163 )
...
Reviewed-on: AkkomaGang/akkoma#163
2022-08-17 00:22:59 +00:00
55179d4214
set soapbox-fe v2 by default
...
fixes #157
2022-08-11 10:25:03 +01:00
5d23df84c9
Mix format
2022-08-07 20:49:56 +01:00
b3e4d81362
StatusView: implement pleroma.context field
...
This field replaces the now deprecated conversation_id field, and now
exposes the ActivityPub object `context` directly via the MastoAPI
instead of relying on StatusNet-era data concepts.
2022-08-07 20:48:08 +01:00
b9bb093600
StatusView: clear MSB on calculated conversation_id
...
This field seems to be a left-over from the StatusNet era.
If your application uses `pleroma.conversation_id`: this field is
deprecated.
It is currently stubbed instead by doing a CRC32 of the context, and
clearing the MSB to avoid overflow exceptions with signed integers on
the different clients using this field (Java/Kotlin code, mostly; see
Husky and probably other mobile clients.)
This should be removed in a future version of Pleroma. Pleroma-FE
currently depends on this field, as well.
2022-08-07 20:47:59 +01:00
62e179f446
make conversation-id deterministic ( #154 )
...
Reviewed-on: AkkomaGang/akkoma#154
2022-08-06 20:59:15 +00:00
ec162b496b
/notice signing checks on redirect ( #150 )
...
Reviewed-on: AkkomaGang/akkoma#150
2022-08-05 19:31:32 +00:00
0ec3a11895
don't persist undo of follows ( #149 )
...
Reviewed-on: AkkomaGang/akkoma#149
2022-08-05 13:28:56 +00:00
c1e15ff6f8
Transmogrifier: fix reply context fixing
...
Incoming Pleroma replies to a Misskey thread were rejected due to a
broken context fix, which caused them to not be visible until a
non-Pleroma user interacted with the replies.
This fix properly sets the post-fix object context to its parent Create
activity as well, if it was changed.
2022-08-04 12:57:48 +01:00
c9600dbbbf
local-only-fixed ( #138 )
...
Reviewed-on: AkkomaGang/akkoma#138
2022-08-02 14:46:46 +00:00
ca000f8301
Merge mrf_simple-reject with quarantine ( #137 )
...
Reviewed-on: AkkomaGang/akkoma#137
2022-08-02 14:19:24 +00:00
e26388a01c
Support reaching user@sub.domain.tld at user@domain.tld ( #134 )
...
Reviewed-on: AkkomaGang/akkoma#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
c3eea8dc7d
expose bubble instances via nodeinfo ( #136 )
...
Reviewed-on: AkkomaGang/akkoma#136
2022-08-02 09:11:22 +00:00
19a27ff006
allow small/center tags in misskeymarkdown ( #132 )
...
Reviewed-on: AkkomaGang/akkoma#132
2022-08-01 12:46:52 +00:00
38659e5610
Use uppercase HTTP HEAD method for media preview proxy request ( #128 )
...
Reviewed-on: AkkomaGang/akkoma#128
Co-authored-by: Yukkuri <iamtakingiteasy@eientei.org>
Co-committed-by: Yukkuri <iamtakingiteasy@eientei.org>
2022-07-30 21:58:14 +00:00
db99edacfe
do the same for soapbox
2022-07-29 10:10:12 +01:00
4f6caae209
ensure we can't run the same clause of fix_quote_url more than once
2022-07-29 10:08:40 +01:00
bf3f934275
add guards around fix misskey content
2022-07-29 10:04:04 +01:00
405406601f
Fix emoji qualification ( #124 )
...
Reviewed-on: AkkomaGang/akkoma#124
2022-07-28 12:02:36 +00:00
2796a9acaf
backend-i18n ( #121 )
...
Reviewed-on: AkkomaGang/akkoma#121
2022-07-27 21:56:59 +00:00
645f0390bc
Prepare for ubuntu22 murdering openssl ( #120 )
...
Reviewed-on: AkkomaGang/akkoma#120
2022-07-27 21:48:13 +00:00
a3501cab86
ensure quote fetching obeys max thread distance ( #119 )
...
Reviewed-on: AkkomaGang/akkoma#119
2022-07-26 17:28:47 +00:00
0a55c37182
don't error out if the featured collection has a string ID
2022-07-26 15:08:35 +01:00
1f6deb0ef4
include local instance in bubble timeline ( #117 )
...
Reviewed-on: AkkomaGang/akkoma#117
2022-07-26 12:22:49 +00:00
90c4785b89
remove public post quarantine exception ( #114 )
...
Reviewed-on: AkkomaGang/akkoma#114
2022-07-26 11:09:13 +00:00
1419eee5df
Quote posting ( #113 )
...
Reviewed-on: AkkomaGang/akkoma#113
2022-07-25 16:30:06 +00:00
cb6e7359af
add bubble timeline ( #100 )
...
Reviewed-on: AkkomaGang/akkoma#100
2022-07-22 14:55:38 +00:00
0c542e58aa
Remove instrumentors ( #98 )
...
Reviewed-on: AkkomaGang/akkoma#98
2022-07-21 11:32:17 +00:00
0f132b802d
purge chat and shout endpoints
2022-07-21 11:29:28 +01:00
07ea4d73e1
update mastofe paths ( #95 )
...
Reviewed-on: AkkomaGang/akkoma#95
2022-07-20 20:13:50 +00:00
3b8bf8464f
update features array
2022-07-20 15:43:41 +01:00
729f45ccd2
purge ldap authenticator ( #92 )
...
Reviewed-on: AkkomaGang/akkoma#92
2022-07-20 12:49:13 +00:00
dc9f66749c
remove all endpoints marked as deprecated ( #91 )
...
Reviewed-on: AkkomaGang/akkoma#91
2022-07-20 12:00:58 +00:00
cf0ad02ea9
Remove scrobbling support
2022-07-19 15:07:45 +01:00
54ed8760ff
Merge branch 'from/upstream-develop/tusooa/server-announcements' into 'develop' ( #85 )
...
Reviewed-on: AkkomaGang/akkoma#85
2022-07-18 13:08:36 +00:00
5b4d77eaa7
maintenance: dependency upgrade ( #81 )
...
Reviewed-on: AkkomaGang/akkoma#81
2022-07-18 00:56:35 +00:00
d598c7a834
remove anonymous function from plug
2022-07-14 11:17:14 +01:00
4aee900ae8
fix compilation
2022-07-14 10:48:27 +01:00
37ae047e16
Add swaggerUI options ( #66 )
...
Reviewed-on: AkkomaGang/akkoma#66
2022-07-13 15:09:35 +00:00
Tusooa Zhu
4c5bc3e9f7
Pass remote follow avatar into media proxy
2022-07-12 15:44:38 -04:00
8215434c65
also resolve @full@tags in mfm ( #62 )
...
Reviewed-on: AkkomaGang/akkoma#62
2022-07-11 13:48:43 +00:00
ff6c8455fb
[ #58 ] ensure all users are linked in MFM content ( #61 )
...
Reviewed-on: AkkomaGang/akkoma#61
2022-07-11 11:48:29 +00:00
5ad256f170
[ #58 ] pre-link MFM content ( #59 )
...
Reviewed-on: AkkomaGang/akkoma#59
2022-07-10 17:06:25 +00:00
82fa766ed7
Remove precompiled javascript ( #55 )
...
Reviewed-on: AkkomaGang/akkoma#55
2022-07-08 13:03:18 +00:00
bc6bfe383f
Add configurable theme color ( #53 )
...
Reviewed-on: AkkomaGang/akkoma#53
2022-07-06 20:00:43 +00:00
364b6969eb
Use finch everywhere ( #33 )
...
Reviewed-on: AkkomaGang/akkoma#33
2022-07-04 16:30:38 +00:00
sfr
058bf96798
implement Move activities ( #45 )
...
Reviewed-on: AkkomaGang/akkoma#45
Co-authored-by: sfr <sol@solfisher.com>
Co-committed-by: sfr <sol@solfisher.com>
2022-07-04 16:29:39 +00:00
95ef3a8b1e
Use Akkoma modification for collections
2022-07-03 19:36:30 +01:00
0a3a552696
Add support for a first
reference in pinned objects
2022-07-03 17:25:20 +01:00
3f7c64f30b
Fix broken attachments from owncast ( #31 )
...
Reviewed-on: AkkomaGang/akkoma#31
2022-07-01 11:14:55 +00:00
1ecdb19de5
Refactor ES on top of search behaviour
2022-06-30 16:28:31 +01:00
Ekaterina Vaartis
7f53aa400b
Don't try removing deleted users and such from index as posts
2022-06-29 20:49:45 +01:00
Ekaterina Vaartis
c128798418
Rename Activity.Search to Search.DatabaseSearch
2022-06-29 20:49:44 +01:00
Ekaterina Vaartis
ea582fbf93
Rename search.ex to database_search.ex and add search/2
2022-06-29 20:49:00 +01:00
Ekaterina Vaartis
d99a2be351
Only add local posts to index in activity_pub
...
Remote ones are already added in another place
2022-06-29 20:48:44 +01:00
Ekaterina Vaartis
37913c8ddf
Use proper deleted object for removing from index
2022-06-29 20:48:44 +01:00
Ekaterina Vaartis
a937a98df5
Don't try removing from index again in common_api
...
It's already removed in the side effects of the pipeline
2022-06-29 20:48:44 +01:00
Ekaterina Vaartis
b3401ba7bd
Also index incoming federated posts
2022-06-29 20:48:29 +01:00
Ekaterina Vaartis
e5ac2ffa07
Ensure only indexing public posts and implement clearing and delete
2022-06-29 20:48:29 +01:00
Ekaterina Vaartis
e961cf2689
Initial meilisearch implementation, doesn't delete posts yet
2022-06-29 20:48:28 +01:00
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
3fd87b6a75
Skip cache when /objects or /activities is authenticated
...
Ref: fix-local-public
2022-06-29 20:47:27 +01:00
Tusooa Zhu
932e5df19e
Allow to skip cache in Cache plug
...
Ref: fix-local-public
2022-06-29 20:47:26 +01:00
Tusooa Zhu
33d821256e
Fix incorrect fallback when English is set to first language
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
845e5769ce
Make lint happy
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
1b77308644
Allow update_credentials to update User.language
2022-06-29 20:45:35 +01:00
Tusooa Zhu
7726148472
Send emails i18n'd using backend-stored user language
2022-06-29 20:45:19 +01:00
Tusooa Zhu
63a0536d55
Make mail and mailer translatable
2022-06-29 20:45:05 +01:00
Tusooa Zhu
39cfecb188
Make static fe translatable
2022-06-29 20:45:05 +01:00
Tusooa Zhu
03aac29531
Fix tests
2022-06-29 20:45:05 +01:00
Tusooa Zhu
c6652fccae
Make mfa pages translatable
2022-06-29 20:45:03 +01:00
Tusooa Zhu
8f8d2abb12
Make oauth pages translatable
2022-06-29 20:44:48 +01:00
Tusooa Zhu
793922f1d8
Use proper lang attributes in htmls
2022-06-29 20:44:16 +01:00
Tusooa Zhu
ec57e3480c
Make tag feed translatable
2022-06-29 20:44:16 +01:00
Tusooa Zhu
50913c4dc5
Make password reset pages translatable
2022-06-29 20:44:16 +01:00
Tusooa Zhu
8f08c902a5
Make lint happy
2022-06-29 20:44:16 +01:00
Tusooa Zhu
ed1d9e91bc
Make remote follow pages translatable
2022-06-29 20:44:15 +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
2342fface1
Add visibility check in context path ( #26 )
...
Reviewed-on: AkkomaGang/akkoma#26
2022-06-29 09:33:57 +00:00
064c36274c
Purge gopher frontend
2022-06-27 17:31:16 +01:00
d392fafa06
Remove debug prints
2022-06-25 18:43:19 +01:00
f2ff05637f
Allow for embedding object data in publish
2022-06-25 18:41:26 +01:00
45b7d18871
update api spec for custom emoji reaction
2022-06-25 15:45:10 +01:00
3928cecf6b
ensure local statuses are not visible remotely
2022-06-22 17:06:40 +01:00
34e11cef47
check for local_public? on AP route
2022-06-22 16:35:12 +01:00
502382da45
cherry-pick security from upstream
2022-06-22 16:25:05 +01:00
f2f8b81fc4
Use mediaproxy for emoji notifications if enabled
2022-06-17 14:27:22 +02:00
6e1d9c63da
allow %{source} dict in no_empty
2022-06-14 17:41:25 +01:00
abefbcec64
Merge branch 'mfm' into develop
2022-06-14 16:25:47 +01:00
0627da0027
mix format
2022-06-14 16:25:28 +01:00
829ae13572
ensure tests pass
2022-06-14 16:24:03 +01:00
4fb2251221
Allow authoring MFM
2022-06-14 15:56:12 +01:00
3f06ccc9e3
allow source
from misskey
2022-06-14 10:56:18 +01:00
60bfaed368
Allow reacting with emojis containing a number
2022-06-14 11:47:09 +02:00
0f5bea2465
Add emoji_url to notifications to allow rendering
...
Ref #5
2022-06-12 13:35:14 +01:00
2abf8c982e
fix secret key failure
2022-06-11 16:48:04 +01:00
24bf8c3977
mix format
2022-06-11 16:14:31 +01:00
32fbd2e4e3
fix all tests
2022-06-11 16:14:22 +01:00
c3ed86cd1e
fix emoji controller tests
2022-06-11 14:21:50 +01:00
142646426e
fix emoji tests
2022-06-11 14:08:54 +01:00
71f4281850
fix quoting of custom emoji
...
Fixes #3
2022-06-11 14:08:13 +01:00
ed58a6b070
run mix format
2022-06-10 13:41:08 +01:00
801f2b0fc5
Add capabilities for emoji reactions
...
Patch from helene@p.helene.moe
2022-06-09 12:56:34 +01:00
0f2bfeaea7
Enable mediaproxy by default
2022-06-08 17:19:42 +01:00
e910f21d8d
allow undoing
2022-06-08 13:27:25 +01:00
e724da2a42
remove io.inspects
2022-06-08 12:58:12 +01:00
c5467d04e4
add outbound reacts
2022-06-08 12:36:38 +01:00
ad0b8c095c
add custom emoji reaction support
2022-06-08 02:42:44 +01:00
0f6bece60d
Merge remote-tracking branch 'origin/patch/readd-mastofe' into develop
2022-01-08 21:45:12 +00:00
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
8cc6359a85
Merge remote-tracking branch 'upstream/bookwyrm-entities' into develop
2022-01-07 20:23:53 +00:00
25b4395830
just drop unknown tags
2022-01-07 20:14:04 +00:00
34780cf182
Merge remote-tracking branch 'upstream/bookwyrm-entities' into develop
2022-01-07 17:36:21 +00:00
2cc6b1e1bd
Allow for varying name fields
2022-01-07 17:35:56 +00:00
5c48fe1138
make credo happy
2022-01-07 17:31:13 +00:00
92d3742072
Merge remote-tracking branch 'upstream/bookwyrm-entities' into develop
2022-01-07 17:21:44 +00:00
9ee27fb5ec
add bookwyrm entity tests
2022-01-07 17:17:18 +00:00
680c5d8d89
Add compatibility with bookwyrm's weird entities
2022-01-07 16:51:04 +00:00
3252ed0f54
format
2021-12-30 18:05:44 +00:00
4e8ee48cff
delete activities
2021-12-30 18:05:44 +00:00
12a171844b
Merge remote-tracking branch 'upstream/develop' into develop
2021-12-30 18:05:22 +00:00
marcin mikołajczak
1657db656c
AccountController.lookup: skip auth
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2021-12-28 20:02:59 +01:00
marcin mikołajczak
0dd1caa841
AccountController.lookup: skip visibility check
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2021-12-28 18:24:48 +01: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
de7f84deb3
Merge branch 'apps-api-endpoint' into 'develop'
...
Apps API endpoint
See merge request pleroma/pleroma!3583
2021-12-28 14:38:02 +00:00
Alex Gleason
7704a722c0
AppController: remove unnecessary require Logger
2021-12-27 18:30:16 -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
138f5a4517
EnsureStaffPrivilegedPlug: don't let non-moderators through
2021-12-27 17:18:26 -06:00
Alex Gleason
a3fa987611
AdminAPI: fix duplicated routes
2021-12-27 16:58:10 -06:00
f02715c4b2
Fix lint errors
2021-12-27 03:42:03 +03:00
f66675f349
API: fix duplicate :get_password_token route
2021-12-27 02:57:54 +03:00
1c223331fc
API: show info about privileged staff in instance metadata
2021-12-27 02:28:09 +03:00
cd1041c3a4
API: optionally restrict moderators from accessing sensitive data
2021-12-27 02:27:48 +03: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
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
marcin mikołajczak
9775955974
Merge remote-tracking branch 'origin/develop' into remote-follow-api
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2021-12-25 00:52:02 +01: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
3f8fc34593
Merge remote-tracking branch 'origin/develop' into moderators
2021-12-19 12:55:36 -06:00
Alex Gleason
50892a198d
Merge branch 'mkljczk-develop-patch-64464' into 'develop'
...
Add "exposable_reactions" to features, if showing reactions
See merge request pleroma/pleroma!3523
2021-12-19 18:51:41 +00: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
df5359aa72
Merge branch 'replies-count' into 'develop'
...
Fix replies count for remote replies
See merge request pleroma/pleroma!3541
2021-12-19 17:36:25 +00:00
Alex Gleason
d1510c98d7
Merge branch 'link-headers-chats' into 'develop'
...
Add link headers in ChatController.index2
See merge request pleroma/pleroma!3562
2021-12-19 17:35:50 +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
Alex Gleason
7c1d804554
Merge branch 'fix-search-dos' into 'develop'
...
Search: limit number of results (prevent DoS)
See merge request pleroma/pleroma!3563
2021-12-19 17:30:52 +00:00
Tusooa Zhu
3d41ccc47b
Allow updating accepted follow activities in Web.ActivityPub.Utils.update_follow_state_for_all/2
...
Mastodon uses the Reject activity also for the purpose of removing
a follower, in addition to reject a follow request. We should
also update the original Follow activity in this case.
2021-12-17 14:17:51 -05:00
0c0ea169d4
Merge remote-tracking branch 'upstream/develop' into develop
2021-12-16 16:10:08 +00:00
Alex Gleason
e1b89fe3aa
Merge remote-tracking branch 'origin/develop' into live-dashboard
2021-12-15 19:05:36 -05:00
Alex Gleason
29d80b39f2
Add Phoenix LiveDashboard
...
Co-authored-by: Egor Kislitsyn <egor@kislitsyn.com>
2021-12-15 19:05:27 -05:00
lain
6eb7d69e60
Merge branch 'delete-account-fix' into 'develop'
...
TwitterAPI: allow deleting one's own account with request body
Closes #2799 and #2746
See merge request pleroma/pleroma!3564
2021-12-15 21:26:45 +00:00
sadposter
8f78cb3050
Merge branch 'develop' of gitssh.ihatebeinga.live:IHBAGang/pleroma into develop
2021-12-14 14:01:09 +00:00
sadposter
5d901c337e
fix inbound federation
2021-12-14 13:58:16 +00:00
703f53c08f
Search through users and hashtags as well
2021-12-14 13:55:14 +00:00
Alex Gleason
8672ad6b00
TwitterAPI: allow deleting one's own account with request body
2021-12-13 17:07:29 -05:00
Alex Gleason
108dfd1f87
Search: limit number of results
2021-12-12 22:50:07 -06:00
sadposter
144c06487a
fix buggos
2021-12-12 20:01:07 +00:00
ee1a2fc451
fully reference es
2021-12-12 19:40:31 +00:00
67f8bdce4f
fix multi-after-transaction
2021-12-12 19:40:05 +00:00
7502da993b
pipeline it
2021-12-12 19:39:07 +00:00
sadposter
f341e68622
fix bug in inbound
2021-12-12 19:31:47 +00:00
de60b1f3c1
make search provider configurable
2021-12-12 17:35:35 +00:00
fce13cce46
add extra filters
2021-12-12 17:35:35 +00:00
449d8ff165
integrate search endpoint with ES
2021-12-12 17:35:35 +00:00
Alex Gleason
da83839dc1
AttachmentValidator: ingest width and height
2021-12-12 17:35:02 +00:00
Lain Soykaf
eb7bbe3fc8
Linting.
2021-12-12 17:35:02 +00:00
Finn Behrens
66b60f1ee2
move result into with guard
2021-12-12 17:35:02 +00:00
marcin mikołajczak
dff435488d
Add link headers in ChatController.index2
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2021-12-12 17:43:18 +01:00
Alex Gleason
2c96668a2c
Merge remote-tracking branch 'origin/develop' into fix-attachment-dimensions
2021-12-07 13:41:54 -05:00
Alex Gleason
3f03d71ea6
AttachmentValidator: ingest width and height
2021-12-07 12:59:03 -05:00
Lain Soykaf
ca8c676867
Linting.
2021-12-07 12:12:23 -05:00
Finn Behrens
8af53101fb
move result into with guard
2021-12-07 09:18:53 +01:00
marcin mikołajczak
c96e52b88c
Add 'notifying' to relationship for compatibility with Mastodon
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2021-12-06 21:24:12 +01:00
marcin mikołajczak
64a4c147b1
MastoAPI: accept notify param in follow request
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2021-12-06 19:36:58 +01:00
sadposter
6a6260f64e
re-enable deactivated check
2021-12-06 12:03:16 +00:00
sadposter
ca2bd8b72b
remove deactivated_users call
2021-12-06 10:18:16 +00:00
sadposter
bb54720778
add debug
2021-12-05 21:56:11 +00:00
sadposter
c85b278f1e
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
2021-12-05 15:01:23 +00:00
Alex Gleason
8286ceb465
Merge remote-tracking branch 'origin/develop' into password-reset
2021-12-03 00:11:38 -06:00
Alex Gleason
5da4f33bf1
Restore POST /auth/password
2021-12-03 00:10:57 -06:00
marcin mikołajczak
cd5fb84b76
remote_interaction API endpoint
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2021-12-02 16:08:44 +01:00
Alex Gleason
6519f59d91
v2 Suggestions: return is_suggested
through the API
2021-11-26 23:10:01 -06:00
Alex Gleason
8dc1d2201a
Instance: add v2_suggestions feature
2021-11-26 22:45:49 -06:00
Alex Gleason
e5a7547fbe
v2 Suggestions: also filter out users you follow
2021-11-26 21:46:08 -06:00
Alex Gleason
437c1a5a52
v2 Suggestions: actually flter out dismissed suggestions
2021-11-26 21:09:37 -06:00
Alex Gleason
aee55b9a8b
v2 Suggestions: dismiss a suggestion
2021-11-26 20:19:29 -06:00
Alex Gleason
6c0484d571
AdminAPI: suggest a user through the API
2021-11-26 15:19:01 -06:00
Alex Gleason
e28d990ecb
v2 Suggestions: don't skip visibility check
2021-11-26 14:46:29 -06:00
Alex Gleason
b17360cd7c
v2 Suggestions: rudimentary API response
2021-11-26 14:34:10 -06:00
Alex Gleason
7e1caddc58
v2 Suggestions: return empty array
2021-11-25 14:57:36 -06:00
Alex Gleason
720198d569
Merge remote-tracking branch 'pleroma/develop' into manifest
2021-11-24 17:58:58 -06:00
Alex Gleason
cb9359335f
Expose /manifest.json for PWA
2021-11-24 17:50:55 -06:00
marcin mikołajczak
d64d1b1d45
Fix replies count for remote replies
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2021-11-23 11:31:09 +01:00
rinpatch
588bcbac55
Apply 2 suggestion(s) to 2 file(s)
2021-11-22 10:54:44 +00:00
marcin mikołajczak
8e040e098b
Lint
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2021-11-21 18:17:06 +01:00
marcin mikołajczak
106b5c2678
Fix a typo
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2021-11-21 17:36:37 +01:00
marcin mikołajczak
40414bf177
MastoAPI: Add user notes on accounts
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2021-11-21 16:56:26 +01:00
sadposter
a61207cf8f
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
2021-11-19 13:43:24 +00:00
04aca335aa
nodeinfo: report activeMonth and activeHalfyear users fields
2021-11-15 17:01:30 +01:00
lain
e2772d6bf1
Merge branch 'block-behavior' into 'develop'
...
Configurable block visibility, fixes #2123
Closes #2123
See merge request pleroma/pleroma!3242
2021-11-15 14:27:59 +00:00
lain
6e3df11693
Merge branch 'instance-deletion' into 'develop'
...
AdminAPI: endpoint to delete all content from a remote instance
See merge request pleroma/pleroma!3483
2021-11-15 14:24:13 +00:00
lain
bd77243981
Merge branch 'userfeed-fe-fallback' into 'develop'
...
UserController: fall back to frontend when user isn't found
Closes #2730
See merge request pleroma/pleroma!3515
2021-11-15 10:48:56 +00:00
Haelwenn (lanodan) Monnier
23e91ec8dd
activity_pub_controller: Fix misleading debug warning in post_inbox_fallback
2021-11-10 01:11:35 +01:00
sadposter
eb1c7d75f4
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
2021-10-16 14:08:04 +01:00
Haelwenn (lanodan) Monnier
23161526d4
object_validators: Group common fields in CommonValidations
...
Notes:
- QuestionValidator didn't have a :name field but that seems like a mistake
- `_fields` functions can't inherit others because of some Validators
- bto/bcc fields were absent in activities, also seems like a mistake
(Well IIRC we don't or barely support bto/bcc anyway)
2021-10-10 02:50:06 +02:00
Haelwenn (lanodan) Monnier
a17910a6c6
CI: Bump lint stage to elixir-1.12
...
Elixir 1.12 changed formatting rules, this allows to avoid having to rollback to run `mix format`
2021-10-06 08:11:05 +02:00
Haelwenn
92a8ff59aa
Merge branch 'from/develop/tusooa/add-remove-emails' into 'develop'
...
Allow users to remove their emails if instance does not need email to register
See merge request pleroma/pleroma!3522
2021-10-06 05:44:44 +00:00
sadposter
bd9c9136f9
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
2021-09-13 16:14:58 +01:00
marcin mikołajczak
555d7d57c9
Add "exposable_reactions" to features, if showing reactions
2021-09-09 18:35:45 +00:00
Haelwenn
6b3842cf50
Merge branch 'remove/mastofe' into 'develop'
...
Remove MastoFE from Pleroma, fixes #2625
Closes #2625
See merge request pleroma/pleroma!3392
2021-09-07 16:41:53 +00:00
sadposter
c31e491e99
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
2021-09-07 10:00:31 +01:00
Tusooa Zhu
198250dcef
Allow users to remove their emails if instance does not need email to register
2021-09-05 21:27:02 -04:00
181282fb2e
Remove unused Logger
2021-09-01 14:56:48 -05:00
sadposter
b202cf15d6
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
2021-08-30 22:04:42 +01:00
Sean King
3117c60997
Make suggested change for create_response
2021-08-29 07:25:54 -06:00
Sean King
2e59cdd80f
Fix aliases sorting
2021-08-29 07:22:03 -06:00
Sean King
33f063204e
Add unit test for Pleroma API app controller
2021-08-28 23:18:12 -06:00
Sean King
d02cf7b0cd
Fix lint
2021-08-28 18:17:09 -06:00
Sean King
a14e1c0003
Move GET /api/v1/apps to GET /api/v1/pleroma/apps
2021-08-28 18:02:36 -06:00
Sean King
eab6291094
Require follow and read OAuth scopes for GET /api/v1/apps
2021-08-28 11:13:25 -06:00
Ilja
20084329ea
Selecting MRF policies didn't work as intended any more
...
* Policies were put under a new module (Pleroma.Web.ActivityPub.MRF.Policy instead of Pleroma.Web.ActivityPub.MRF), but this wasn't changed in the Pleroma.Web.ActivityPub.MRF @mrf_config_descriptions
* I don't have a unit test to prevent similar problems in the future because I don't find a proper way to do it
* The descriptions in the unit tests are defined in the unit tests, so if someone changes module names in the code, the tests wont see it
* The list is generated in Pleroma.Docs.Generator.list_behaviour_implementations, but I can't do a check in the when clause of the function to see if the provided module is a behaviour or not.
Backport of: https://git.pleroma.social/pleroma/pleroma/-/merge_requests/3509
2021-08-28 18:27:58 +02:00
Ilja
53b0dd4ecc
List available frontends also when no static/frontends folder is present yet
...
* To see what front ends are installed, it ls static/frontends. When this folder doesn't exists yet, it will return an empty array.
* Installing still works since the folder is created during installation already
Backport of: https://git.pleroma.social/pleroma/pleroma/-/merge_requests/3510
2021-08-28 18:23:49 +02:00
09c42ce13e
Add Admin-FE menu for StealEmojiPolicy
...
Backport of: https://git.pleroma.social/pleroma/pleroma/-/merge_requests/3512
2021-08-28 18:21:59 +02:00
Haelwenn
bc62a35282
Merge branch 'features/ingestion-no-nil' into 'develop'
...
ObjectValidator.stringify_keys: filter out nil values
See merge request pleroma/pleroma!3506
2021-08-28 16:07:35 +00:00
Haelwenn
6633ec816f
Merge branch 'admin_fe_dont_list_mrf_policies_any_more' into 'develop'
...
Selecting MRF policies didn't work as intended any more
Closes admin-fe#198
See merge request pleroma/pleroma!3509
2021-08-28 16:06:35 +00:00
Sean King
baa8196fc9
Fix API spec, add app schema
2021-08-26 11:55:43 -06:00
Sean King
ba6914f90a
Fix formatting in app_operation.ex
2021-08-26 11:11:37 -06:00
Sean King
6519732045
GET /api/v1/apps endpoint
2021-08-25 21:01:04 -06:00
Alex Gleason
b11dbbf403
UserController: fall back to frontend when user isn't found
2021-08-17 18:32:32 -05:00
Haelwenn
84ec0fbeaa
Merge branch 'show_frontends_also_when_no_static_frontends_folder_is_created_yet' into 'develop'
...
List available frontends also when no static/frontends folder is present yet
Closes admin-fe#201
See merge request pleroma/pleroma!3510
2021-08-14 18:42:12 +00:00
Ilja
f9bafc17fb
List available frontends also when no static/frontends folder is present yet
...
* To see what front ends are installed, it ls static/frontends. When this folder doesn't exists yet, it will return an empty array.
* Installing still works since the folder is created during installation already
2021-08-14 18:42:12 +00:00
Haelwenn
2d9f803dc6
Merge branch 'StealEmojiMRF_add_adminFE' into 'develop'
...
Add Admin-FE menu for StealEmojiPolicy
See merge request pleroma/pleroma!3512
2021-08-14 18:40:24 +00:00