bigbuffet/pleroma
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
15140 commits 1 branch 0 tags 292 MiB
Commit graph

15140 commits

This branch
This branch
All branches
Author SHA1 Message Date
Hélène
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
Tusooa Zhu
e06f2b9f5e
Add changelog 2022-08-09 18:17:07 -04:00
Tusooa Zhu
738ca484fd
Update api spec to reflect OAuth scope change 2022-08-09 18:15:25 -04:00
Hélène
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
Hélène
7f71e3d0fe
CommonFields: remove context_id 2022-08-09 20:10:43 +02:00
Hélène
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
marcin mikołajczak
8c8f648168 Merge remote-tracking branch 'soapbox/develop' into webfinger-expanding 2022-08-09 13:11:27 +02:00
marcin mikołajczak
25ac4b10dc Add update_nickname_on_user_fetch to description.exs 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-08-09 13:11:18 +02:00
marcin mikołajczak
1455450e42 Set update_nickname_on_user_fetch to false by default 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-08-09 13:02:42 +02:00
Tusooa Zhu
a7f01ffc1d
Make backups require its own scope 2022-08-09 00:34:04 -04:00
marcin mikołajczak
0412cdcb32 Merge remote-tracking branch 'soapbox/develop' into edits 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-08-08 17:01:48 +02:00
marcin mikołajczak
9ce43cf0cb Merge branch 'public-polls-' into 'develop' 
Expose nonAnonymous field from Smithereen polls

See merge request soapbox-pub/soapbox-be!150
 2022-08-08 14:41:24 +00:00
Tusooa Zhu
d487e0160c
Treat containment failure as cancel in ReceiverWorker 2022-08-08 08:41:33 -04:00
marcin mikołajczak
b4575815ed Add entry to @context, tests 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-08-08 10:45:43 +02:00
marcin mikołajczak
3d7d1870b5 Expose nonAnonymous field from Smithereen polls 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-08-07 23:56:52 +02:00
marcin mikołajczak
a665aaaad2 Merge remote-tracking branch 'tusooa/from/upstream-develop/tusooa/edits' into edits 2022-08-06 14:41:12 +02:00
Tusooa Zhu
88e0e6acd5
Fix FederatorTest 2022-08-06 00:42:10 -04:00
Tusooa Zhu
a0166e92fa
Treat MRF rejects as success in Oban worker 2022-08-06 00:33:18 -04:00
Tusooa Zhu
5d900a5cd1
Use latest alpine version for docker image 2022-08-05 23:47:53 -04:00
Alex Gleason
d317e08b49
Add app.json for Dokku 2022-08-05 15:42:56 -05:00
Alex Gleason
5d31b5a9e9
Set GIT_DEPTH=0 for dokku deployment 2022-08-05 14:59:25 -05:00
Alex Gleason
9019550a27
Dokku: add missing dokku@ 2022-08-05 14:20:57 -05:00
Alex Gleason
9817db05f3
GitLab CI: remove before_script from review_app 2022-08-05 13:47:23 -05:00
Alex Gleason
c73a08869d
Deploy review app with Dokku 2022-08-05 13:21:18 -05:00
Alex Gleason
d0d1457680
Docker: respect PORT env, use 5000 by default 2022-08-05 09:32:42 -05:00
Alex Gleason
9832ab2573
docker-entrypoint: use $DATABASE_URL for pg_isready 2022-08-04 22:37:37 -05:00
Alex Gleason
97e141c5e3
docker.exs: simplify database config 2022-08-04 19:53:37 -05:00
Alex Gleason
132a65a87e
Remove .buildpacks 2022-08-04 19:17:30 -05:00
marcin mikołajczak
3b964ee555 Merge branch 'merge-pleroma' into 'develop' 
merge-pleroma

See merge request soapbox-pub/soapbox-be!145
 2022-08-03 22:04:39 +00:00
marcin mikołajczak
55c62d19a8 Merge remote-tracking branch 'pleroma/develop' into merge-pleroma 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-08-03 23:42:48 +02:00
floatingghost
f2a9285ff0
bugfix/follow-state (#104) 
Reviewed-on: https://akkoma.dev/AkkomaGang/akkoma/pulls/104
 2022-08-03 01:07:53 -04:00
Alex Gleason
af622eaf03 Merge branch 'docker' into 'develop' 
Fix the Dockerfile

See merge request soapbox-pub/soapbox-be!143
 2022-08-02 20:55:09 +00:00
Tusooa Zhu
a4fa286d20
Use actor_types() to determine whether the Update is for user 2022-08-02 10:37:28 -04:00
marcin mikołajczak
fdea5d2df6 Merge branch 'stream_markers' into 'develop' 
Stream marker updates

See merge request soapbox-pub/soapbox-be!144
 2022-08-02 07:35:37 +00:00
Haelwenn
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
Haelwenn
7299795eb4 Merge branch 'from/upstream-develop/tusooa/backup-without-email' into 'develop' 
Allow users to create backups without providing email address

See merge request pleroma/pleroma!3665
 2022-08-02 05:23:49 +00:00
Haelwenn
f8540b0a9d Merge branch 'weblate' into 'develop' 
Translations update from Pleroma Weblate

See merge request pleroma/pleroma!3716
 2022-08-02 05:10:51 +00:00
marcin mikołajczak
fe0c02f2c8 Stream marker updates 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-08-01 19:07:17 +02:00
Yating Zhan
99d4823ab1 Translated using Weblate (Chinese (Simplified)) 
Currently translated at 18.9% (189 of 998 strings)

Translation: Pleroma/Pleroma Backend (domain config_descriptions)
Translate-URL: http://weblate.pleroma-dev.ebin.club/projects/pleroma/pleroma-backend-domain-config_descriptions/zh_Hans/
 2022-07-31 22:00:56 +00:00
tusooa
cc533e6956 Translated using Weblate (Chinese (Simplified)) 
Currently translated at 18.9% (189 of 998 strings)

Translation: Pleroma/Pleroma Backend (domain config_descriptions)
Translate-URL: http://weblate.pleroma-dev.ebin.club/projects/pleroma/pleroma-backend-domain-config_descriptions/zh_Hans/
 2022-07-31 22:00:56 +00:00
Haelwenn
7de21ec991 Merge branch 'from/develop/tusooa/emit-move' into 'develop' 
Implement moving account

See merge request pleroma/pleroma!3524
 2022-07-31 22:00:40 +00:00
Haelwenn
5ef2dc317d Change test case wording 2022-07-31 21:34:23 +00:00
tusooa
c80096522c Merge branch 'develop' into 'from/develop/tusooa/emit-move' 
# Conflicts:
#   CHANGELOG.md
#   test/pleroma/user_test.exs
 2022-07-31 21:32:49 +00:00
Haelwenn
b5266097a1 Merge branch 'mutes' into 'develop' 
MastoAPI: Use `duration` param for mute expiration duration

See merge request pleroma/pleroma!3715
 2022-07-31 19:41:25 +00:00
marcin mikołajczak
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
Haelwenn
0814d0e0cb Merge branch 'fix/proper-emoji-qualification' into 'develop' 
Emoji: implement full-qualifier using combinations

See merge request pleroma/pleroma!3709
 2022-07-28 04:46:15 +00:00
Haelwenn
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
Haelwenn
18d6a58c7e Merge branch 'from/upstream-develop/tusooa/gettext-extract' into 'develop' 
Extract translatable strings

See merge request pleroma/pleroma!3712
 2022-07-28 04:33:17 +00:00
Alex Gleason
288d1bf1b8
Docker: update maintainer data 2022-07-26 20:00:06 -05:00
Alex Gleason
246f0df88e
Fix the Dockerfile 2022-07-26 19:58:42 -05:00