1e9333a9aa
Merge remote-tracking branch 'origin/develop' into instance-v2
2023-11-08 20:46:57 +01:00
93370b870a
Expose nonAnonymous field from Smithereen polls
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2023-10-28 23:58:39 +02:00
c6cedbb810
InstanceV2: skip auth
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2023-10-28 00:07:18 +02:00
6b8c5e12df
Add contact account to InstanceView
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2023-10-26 23:32:08 +02:00
a348c2e4dd
Use pleroma: instead of pleroma. for ws events
2023-10-15 17:20:25 -04:00
7d005e8c93
Return stream attribute in server-sent events
2023-10-15 17:20:23 -04:00
21395aa509
Allow authenticating via client-sent events
2023-10-15 17:19:49 -04:00
273cda63ad
Allow subscribing to streams
2023-10-15 17:19:49 -04:00
2b5636bf12
Allow unified streaming endpoint
2023-10-15 17:19:40 -04:00
08608afca5
Fix quote_visible attribute
2023-09-13 19:20:33 -04:00
a8b2f9205d
Expose quote_id parameter on the api
2023-09-13 19:20:32 -04:00
cf8e425883
StatusView: return quote post inside a reblog
2023-09-13 19:19:04 -04:00
74e0a4555f
StatusView: add `quote_visible` param
2023-09-13 19:19:04 -04:00
6f11f11519
StatusView: fix quote visibility
2023-09-13 19:19:04 -04:00
80ab2572a4
Return quote_url through the API, don't render quotes more than 1 level deep
2023-09-13 19:19:04 -04:00
5716f88a1d
InstanceView: add "quote_posting" feature
2023-09-13 19:19:03 -04:00
0d9c443e51
StatusView: render the whole quoted status
2023-09-13 19:19:03 -04:00
ce5eb31723
StatusView: show quoted posts through the API, probably
2023-09-13 19:19:03 -04:00
28ef5ebd3c
Update InstanceView.features
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2023-09-07 15:00:24 +02:00
79e46ce73f
InstanceView: Add common_information function
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2023-08-11 13:57:22 +02:00
9effa24f30
Implement api/v2/instance route
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2023-08-11 00:08:05 +02:00
2c66f584b5
Show more informative errors when profile exceeds char limits
2023-05-25 08:22:33 -04:00
c5d946bc92
Fix emoji reactions for legacy 2-tuple formats
2023-03-26 15:12:40 -04:00
353538d16c
Merge branch 'pleroma-akkoma-emoji-port' into 'develop'
...
Custom emoji reactions support
See merge request pleroma/pleroma!3845
2023-03-16 08:00:00 +00:00
2c2ea16b50
Allow custom emoji reactions: Add pleroma_custom_emoji_reactions feature, review changes
2023-03-12 11:39:17 +03:00
8d3b29aaba
Allow custom emoji reactions: add test for mixed emoji react, fix credo errors
2023-03-02 11:18:16 +03:00
4b85d1c617
Allow custom emoji reactions: Fix tests, mixed custom and unicode reactions
2023-03-02 11:18:16 +03:00
787e30c5fd
Allow reacting with remote emoji when they exist on the post ( #200 )
...
Co-authored-by: FloatingGhost <hannah@coffee-and-dreams.uk>
Reviewed-on: https://akkoma.dev/AkkomaGang/akkoma/pulls/200
2023-03-02 11:18:16 +03:00
d83f16fe44
Allow with_relationships param for blocks
2023-02-28 22:16:01 -05:00
755279e253
Merge branch 'tusooa/api-spec-property-map' into 'develop'
...
OpenApiSpex: overhaul
See merge request pleroma/pleroma!3832
2023-02-09 19:50:59 +00:00
bc7ec43179
Allow customizing instance languages
2023-01-26 20:17:13 -05:00
97f947deaf
Fix tests
2023-01-15 21:39:05 -05:00
e853cfe7c3
Revert "Merge branch 'copyright-bump' into 'develop'"
...
This reverts merge request !3825
2023-01-02 20:38:50 +00:00
10886eeaa2
Bump copyright year
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2023-01-01 12:13:06 +01:00
90681c720d
Make lint happy
2022-12-21 23:40:39 -07:00
351b5a9df4
Use crazy hack to finally get pleroma:report notifications not visible after revoking privileges
2022-12-21 23:35:39 -07:00
398141da68
Merge remote-tracking branch 'upstream/develop' into meilisearch
2022-12-20 21:00:07 +03:00
60df2d8a97
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into fine_grained_moderation_privileges
2022-12-18 22:03:48 -07:00
a3985aac91
Merge branch 'fix-2856' into 'develop'
...
Uploading an avatar media exceeding max size returns a 413
Closes #2856
See merge request pleroma/pleroma!3804
2022-12-16 16:15:36 +00:00
4a32b584e1
StatusView: Fix warning
2022-12-15 18:02:33 -05:00
9876742358
Return 413 when an actor's banner or background exceeds the size limit
2022-12-11 23:15:08 +01:00
452595baed
Uploading an avatar media exceeding max size returns a 413
...
Until now it was returning a 500 because the upload plug were going
through the changeset and ending in the JSON encoder, which raised
because struct has to @derive the encoder.
2022-12-11 22:54:47 +01:00
a6946048fb
Rename Activity.Search to Search.DatabaseSearch
2022-10-10 20:19:09 +03:00
0fae71f88d
Rename search.ex to database_search.ex and add search/2
2022-10-10 20:19:09 +03:00
e154ebbf79
Initial meilisearch implementation, doesn't delete posts yet
2022-10-10 20:19:08 +03:00
dd82fd234f
Merge branch 'release/2.4.4' into mergeback/2.4.4
2022-10-08 22:15:09 -04:00
1a7107f4a5
Merge branch 'remove_from_followers' into 'develop'
...
MastoAPI: POST /api/v1/accounts/:id/remove_from_followers
See merge request pleroma/pleroma!3647
2022-09-16 23:24:13 +00:00
ea60c4e709
Fix wrong relationship direction
2022-09-14 20:24:04 -04:00
20347898e2
Merge branch 'fix/federation-context-issues' into 'develop'
...
Fix reply context fixing (Pleroma replies to Misskey threads) and removal of context objects
See merge request pleroma/pleroma!3717
2022-09-04 18:43:36 +00:00
e40c221c31
Merge branch 'from/upstream-develop/tusooa/edits' into 'develop'
...
Editing
Closes #1429 , #2859 , and #2288
See merge request pleroma/pleroma!3678
2022-09-03 02:16:42 +00:00
c59ee1f172
Expose availability of GET /main/ostatus via instance
2022-08-20 21:19:31 -04:00
f459c1260b
Lint
2022-08-19 20:24:24 -04:00
c62a4f1c17
Disconnect streaming sessions when token is revoked
2022-08-19 20:22:45 -04:00
def0f5dc2e
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-10 02:29:38 +02:00
a9111bcaf2
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-09 20:10:43 +02:00
7f71e3d0fe
CommonFields: remove context_id
2022-08-09 20:10:43 +02:00
f3e061c964
Object: remove context_id field
...
30 to 70% of the objects in the object table are simple JSON objects
containing a single field, 'id', being the context's ID. The reason for
the creation of an object per context seems to be an old relic from the
StatusNet era, and has only been used nowadays as an helper for threads
in Pleroma-FE via the `pleroma.conversation_id` field in status views.
An object per context was created, and its numerical ID (table column)
was used and stored as 'context_id' in the object and activity along
with the full 'context' URI/string.
This commit removes this field and stops creation of objects for each
context, which will also allow incoming activities to use activity IDs
as contexts, something which was not possible before, or would have been
very broken under most circumstances.
The `pleroma.conversation_id` field has been reimplemented in a way to
maintain backwards-compatibility by calculating a CRC32 of the full
context URI/string in the object, instead of relying on the row ID for
the created context object.
2022-08-09 20:10:43 +02:00
b2ba307f4d
Merge branch 'from/upstream-develop/tusooa/2871-fix-local-public' into 'develop'
...
local only fixes
Closes #2871
See merge request pleroma/pleroma!3660
2022-08-02 05:39:50 +00:00
5d3d6a58f7
Use `duration` param for mute expiration duration
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-07-31 17:22:34 +02:00
0f9f3d2897
Merge branch 'from/upstream-develop/tusooa/2384-pagination' into 'develop'
...
Make mutes and blocks behave the same as other lists
Closes #2384
See merge request pleroma/pleroma!3693
2022-07-28 04:37:10 +00:00
301ce5bc62
Merge branch 'mute-expiration' into 'develop'
...
MastoAPI: Show mutes expiration date
See merge request pleroma/pleroma!3682
2022-07-23 00:34:15 +00:00
8aba7c08d1
Merge branch 'notification_types' into 'develop'
...
MastoAPI: Use `types` for filtering notifications
See merge request pleroma/pleroma!3648
2022-07-17 03:17:43 +00:00
44d14e8a9c
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into fine_grained_moderation_privileges
2022-07-14 07:07:19 +02:00
fdc71f6051
Merge branch 'short-description' into 'develop'
...
Add short_description instance field
Closes #2865
See merge request pleroma/pleroma!3651
2022-07-13 04:42:24 +00:00
c1874bc8f9
Make mutes and blocks behave the same as other lists
2022-07-12 19:03:18 -04:00
f88ed1df75
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into fine_grained_moderation_privileges
2022-07-05 12:05:19 +02:00
4edc867b87
Merge branch 'develop' into 'from/upstream-develop/tusooa/edits'
...
# Conflicts:
# lib/pleroma/constants.ex
2022-07-03 22:24:57 +00:00
6b937d1473
Merge branch 'from/upstream-develop/tusooa/server-announcements' into 'develop'
...
Server announcements (1st pass)
See merge request pleroma/pleroma!3643
2022-07-03 20:58:20 +00:00
37fdf148b0
Rename privilege tags
...
I first focussed on getting things working
Now that they do and we know what tags there are, I put some thought in providing better names
I use the form <what_it_controls>_<what_it_allows_you_to_do>
:statuses_read => :messages_read
:status_delete => :messages_delete
:user_read => :users_read
:user_deletion => :users_delete
:user_activation => :users_manage_activation_state
:user_invite => :users_manage_invites
:user_tag => :users_manage_tags
:user_credentials => :users_manage_credentials
:report_handle => :reports_manage_reports
:emoji_management => :emoji_manage_emoji
2022-07-01 10:28:09 +02:00
99a6f50316
Unify the logic of updating objects
2022-06-25 00:32:22 -04:00
06da000c5d
Add editing to features
2022-06-21 12:32:44 -04:00
211e561e2a
Show privileges to FE
...
I added an extra key
We already had is_admin and is_moderator, now we have an extra privileges key
2022-06-21 12:10:27 +02:00
143ea7b80a
Add deactivated status for privileged users
...
Deactivated users are only visible to users privileged with :user_activation since fc317f3b17
Here we also make sure the users who are deactivated get the status deactivated for users who are allowed to see these users
2022-06-21 12:10:27 +02:00
eab13fed3e
Hide pleroma:report for non-privileged users
...
Before we deleted the notifications, but that was a side effect and didn't always trigger any more.
Now we just hide them when an unprivileged user asks them.
2022-06-21 12:10:27 +02:00
5a65e2dac5
Remove privileged_staff
...
Everything that was done through this setting, can now be set by giving the proper privileges to the roles.
2022-06-21 12:10:27 +02:00
b0f83aea29
Store mutes expiration date
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-06-16 20:38:37 +02:00
44613db853
Show original status at the first of history
2022-06-11 19:52:07 -04:00
95b3922328
Workaround with_index does not support function in Elixir 1.9
2022-06-11 17:02:29 -04:00
27f3d802f2
Expose history and source apis to anon users
2022-06-11 10:35:36 -04:00
c3593639ad
Fix incorrectly cached content after editing
2022-06-09 11:39:51 -04:00
aafd7a687d
Return the corresponding object id in attachment view
2022-06-08 11:45:24 -04:00
532f6ae3ed
Return update notification in mastodon api
2022-06-05 16:34:42 -04:00
fe2d4778ee
Expose content type of status sources
2022-06-04 12:57:30 -04:00
3249ac1f12
Show edited_at in MastodonAPI/show
2022-06-03 21:47:40 -04:00
b613a9ec6b
Implement mastodon api for editing status
2022-05-31 14:32:28 -04:00
393b508846
Implement viewing source
2022-05-30 00:59:23 -04:00
c004eb0fa2
Implement mastodon api for showing edit history
2022-05-29 23:50:31 -04:00
c48be59f58
Show local-only statuses in public timeline for authenticated users
...
Ref: fix-local-public
2022-05-06 13:54:02 -04:00
7d1dae3bef
Restrict mastodon api announcements to logged-in users only
2022-04-02 02:25:13 -04:00
fbf9eced11
Add short_description field
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-03-29 14:04:27 +02:00
d7c53da77a
Merge branch 'from/upstream-develop/tusooa/translate-pages' into 'develop'
...
Translate backend-rendered pages
See merge request pleroma/pleroma!3634
2022-03-20 18:14:37 +00:00
31ff467eff
Use `types` for filtering notifications
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-03-16 21:15:44 +01:00
ffe081bf44
Use reject_follow_request
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-03-16 19:18:15 +01:00
6754d1f272
POST /api/v1/accounts/:id/remove_from_followers
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-03-16 16:52:33 +01:00
881179ec72
Remove GET /api/v1/announcements/:id
2022-03-08 19:22:28 -05:00
d569694ae9
Show only visible announcements in MastodonAPI
2022-03-08 19:20:29 -05:00
009817c9ee
Correct docstring for AnnouncementController.show
2022-03-08 17:00:49 -05:00
2b39b36e49
Implement POST /api/v1/announcements/:id/dismiss
2022-03-08 16:59:20 -05:00
aa1fff279e
Implement GET /api/v1/announcements/:id
2022-03-08 16:19:35 -05:00
5169ad8f14
Implement announcement read relationships
2022-03-08 13:09:49 -05:00
Marcin Mikołajczak