lain
4a7b89e372
ChatMessageValidator: Additional validation.
2020-07-03 15:13:27 +02:00
lain
5c0bf4c472
ActivityPub: Ingest information about chat acceptance.
2020-07-03 13:58:34 +02:00
lain
26a7cc3f00
UserView: Add acceptsChatMessages field
2020-07-03 13:38:59 +02:00
lain
db76c26469
AccountViewTest: Fix test.
2020-07-03 13:24:16 +02:00
lain
3250228be9
AccountView: Add 'accepts_chat_messages' to view.
2020-07-03 13:07:33 +02:00
lain
98bfdba108
User: On registration, set accepts_chat_messages to true.
2020-07-03 12:47:05 +02:00
Mark Felder
8121e46f25
Merge branch 'develop' into activation-meta
2020-07-02 13:01:22 -05:00
rinpatch
4c044f6225
Merge branch 'fetcher-fixes' into 'develop'
...
Don't fail fetching when the user in a replied-to message can't be fetched.
See merge request pleroma/pleroma!2711
2020-07-02 10:17:51 +00:00
lain
311b7c19d0
Streamer: Align announce streaming with polling.
2020-07-02 09:50:26 +02:00
lain
61fe94d698
SideEffects: Refactor.
2020-07-02 09:33:50 +02:00
rinpatch
fa7a0be225
Merge branch '1716-handle-nickname-clashes' into 'develop'
...
ActivityPub: Handle clashing nicknames for the same ap id
Closes #1716
See merge request pleroma/pleroma!2712
2020-07-01 13:51:23 +00:00
lain
fedfe8f7d6
ActivityPub: Handle clashing nicknames for the same ap id
...
If we get a new user (identified by ap_id) that would have the same
nickname as an existing user, give the existing user a nickname that
is prepended with the user id, as this will never clash.
This can happen when a user switches server software and that soft-
ware generates ap ids in a different way.
2020-07-01 12:26:07 +02:00
lain
ce92e6e5ce
Fetcher: Work when we can't get the OP.
2020-07-01 11:48:51 +02:00
lain
8ae572d5ae
Fixtures: Pretty print.
2020-07-01 11:47:45 +02:00
lain
691742e62d
Revert "Merge branch 'avatar-removing' into 'develop'"
...
This reverts merge request !2701
2020-07-01 08:51:56 +00:00
Mark Felder
5a8e0208b1
Add fields limits to instance metadata, add tests
2020-06-30 15:25:10 -05:00
Mark Felder
d69af7f742
Rename user.settings column
...
This is used exclusively by MastoFE/GlitchFE now
2020-06-30 11:50:53 -05:00
lain
0176b7bca2
Merge branch 'preload-fixups-2' into preloadfixups
2020-06-30 11:40:34 +02:00
lain
2382a2a151
Preload: Load the correct instance panel
2020-06-30 11:35:54 +02:00
rinpatch
7bb3618939
Merge branch 'fix-notification-filtering' into 'develop'
...
Notifications: Never return `nil` in the notification list.
See merge request pleroma/pleroma!2705
2020-06-29 18:06:25 +00:00
lain
c01f4ca07f
Notification: Remove TODO.
2020-06-29 17:52:56 +02:00
lain
90083a754d
Notifications: Never return nil in the notification list.
2020-06-29 17:48:18 +02:00
Egor Kislitsyn
3aa04b81c4
Test default "content-type" for CastAndValidate
2020-06-29 19:47:04 +04:00
lain
07ff2d62f4
Merge branch 'rich-media-parser-exclude-attachment-links' into 'develop'
...
excluding attachment links from RichMedia
See merge request pleroma/pleroma!2702
2020-06-29 12:44:58 +00:00
Alexander Strizhakov
6512ef6879
excluding attachment links from RichMedia
2020-06-29 15:25:57 +03:00
lain
651f269568
Merge branch 'avatar-removing' into 'develop'
...
UpdateCredentialsTest: Add test for removing profile images.
See merge request pleroma/pleroma!2701
2020-06-29 11:16:30 +00:00
lain
e64d08439e
UpdateCredentialsTest: Add test for removing profile images.
2020-06-29 12:40:23 +02:00
lain
8630a6c7f5
Preloaders: Use strings as keys.
2020-06-29 11:41:00 +02:00
lain
a19f8778af
User preloader: Put user info at correct key
2020-06-29 11:06:20 +02:00
lain
577da132da
Merge branch '1031-parent-visible' into 'develop'
...
Resolve "Add `pleroma.parent_visible` to the status view"
Closes #1031
See merge request pleroma/pleroma!2679
2020-06-29 08:39:51 +00:00
Haelwenn
bf1c5e255a
Merge branch 'block-handling' into 'develop'
...
Handle blocks with the pipeline
See merge request pleroma/pleroma!2685
2020-06-26 17:41:00 +00:00
Haelwenn
09478c9cf7
Merge branch '1258-anti-link-spam-exemption' into 'develop'
...
AntiSpamLinkPolicy: Exempt local users.
Closes #1258
See merge request pleroma/pleroma!2686
2020-06-26 16:59:46 +00:00
lain
a2002ebb63
Preloading: Fix nodeinfo url.
2020-06-26 14:48:23 +02:00
lain
4a7a34ae8c
Preloading: Return correct data for statusnet stuff.
2020-06-26 14:47:38 +02:00
lain
7ed2296416
Nodeinfo: Add chat information back in.
2020-06-26 13:04:15 +02:00
lain
15a8b70318
User: Don't unfollow on block when the relevant setting is set.
2020-06-26 12:06:00 +02:00
lain
c3383d4fab
BlockValidator: Restore old behavior for incoming blocks.
2020-06-26 11:58:40 +02:00
8288419686
Merge branch 'preload-data' into 'develop'
...
Preload data into index.html
Closes #1660
See merge request pleroma/pleroma!2381
2020-06-25 21:35:39 +00:00
lain
04abee782b
AntiSpamLinkPolicy: Exempt local users.
2020-06-25 12:40:39 +02:00
lain
1cd1977c0f
Merge branch 'issue/1872-ex_aws' into 'develop'
...
[#1872 ] use Pleroma.HTTP for ExAws.S3
See merge request pleroma/pleroma!2683
2020-06-25 10:14:19 +00:00
lain
84f9ca1956
Blocking: Don't federate if the options is set.
2020-06-25 12:03:14 +02:00
lain
44bb7cfccd
ActivityPub: Remove block.
2020-06-25 11:51:33 +02:00
lain
e38293c8f1
Transmogrifier: Switch to pipeline for Blocks.
2020-06-25 11:33:54 +02:00
lain
89e5b2046b
ObjectValidator: Basic Block support.
2020-06-25 11:13:35 +02:00
lain
d137f934df
Transmogrifier Test: Extract block handling.
2020-06-25 10:54:00 +02:00
lain
0e26ef2ab9
Merge branch 'fix/following-request-from-deactivated' into 'develop'
...
Filter outstanding follower requests from deactivated accounts
Closes #1771
See merge request pleroma/pleroma!2682
2020-06-25 06:50:44 +00:00
Maksim Pechnikov
439a1a0218
added wrapper Pleroma.HTTP for ExAws.S3
2020-06-25 07:12:29 +03:00
Mark Felder
67ab580553
Filter outstanding follower requests from deactivated accounts
2020-06-24 17:18:53 -05:00
lain
35f6770436
StatusView: Add pleroma.parent_visible
2020-06-24 13:29:08 +02:00
lain
88ccade1cb
Merge branch 'feature/admin-api-status-count-per-instance' into 'develop'
...
admin api status count per instance
See merge request pleroma/pleroma!2500
2020-06-24 10:42:07 +00:00
