626e094589
MRF: fix up unserializable option lists in describe implementations
2019-08-14 18:54:17 +00:00
8778c16dac
Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
2019-08-14 21:44:50 +03:00
a180c1360e
[ #1149 ] Oban mailer job. Adjusted tests.
2019-08-14 21:42:21 +03:00
c43152f6c1
fix formatting
2019-08-14 14:01:11 -04:00
d81f63845a
Implement Pleroma.Stats as GenServer
2019-08-14 11:59:33 -04:00
574856ef01
streamline Streamer pings
2019-08-14 11:58:32 -04:00
15ef521009
Isolate OAuth.Token.CleanWorker
2019-08-14 11:57:50 -04:00
51bdf0cab6
use default child_specs
2019-08-14 11:55:17 -04:00
d3af9e19ed
Conversations: Load relations in one query.
2019-08-14 17:01:11 +02:00
c9970feee2
Fix compatibility with Elixir 1.8
2019-08-14 21:03:25 +07:00
f73212b2a3
Conversation: Render new participation on update.
2019-08-14 15:56:15 +02:00
df81abb68c
Conversations: Use correct oauth paths for extended api.
2019-08-14 15:55:43 +02:00
4b7f1c6995
Improve digest email template
2019-08-14 20:46:05 +07:00
560dbad538
Merge remote-tracking branch 'origin/develop' into pleroma-conversations
2019-08-14 15:30:40 +02:00
672fcbc7b7
Limit custom fields for old remote users
2019-08-14 14:58:06 +07:00
e457fcc479
Add `:max_remote_account_fields` config option
2019-08-14 14:58:06 +07:00
f7bbf99caa
Use info.fields instead of source_data for remote users
2019-08-14 14:52:54 +07:00
2c35d4b0b0
Add configurable account field name length limit
2019-08-14 14:52:54 +07:00
db3c05f6b4
Add configurable account field value length limit
2019-08-14 14:52:54 +07:00
7d6f8a7fd7
Linkify custom fields values in ActivityPub.UserViewx
2019-08-14 14:52:54 +07:00
5178f960c3
Support user attachment update in Transmogrifier
2019-08-14 14:52:54 +07:00
88598c9baf
Add profile custom fields to ActivityPub.UserView
2019-08-14 14:52:54 +07:00
a22f540fc4
Add custom fields to TwitterAPI.UserView
2019-08-14 14:52:54 +07:00
e0ac5c7a66
Add custom profile fields
2019-08-14 14:52:54 +07:00
5c35d2f1d8
Merge branch 'preload-user-timelines' into 'develop'
...
Preload thread mutes/bookmarks in user_statuses
See merge request pleroma/pleroma!1563
2019-08-14 01:04:07 +00:00
fe42844bda
Merge branch 'get-context-optimizations' into 'develop'
...
Preload thread mutes/bookmarks in get_context
See merge request pleroma/pleroma!1562
2019-08-14 01:03:54 +00:00
8202f1634a
Preload thread mutes/bookmarks in user_statuses
2019-08-14 03:02:09 +03:00
f4e087ee48
Preload thread mutes/bookmarks in get_context
...
Also removes filtering for creates (was done on the database side
already) and filtering for the requested activity (moved to the database
side) from application side.
2019-08-14 02:36:54 +03:00
9ef31767f2
Merge branch 'feature/mrf-vocabulary' into 'develop'
...
MRF Vocabulary
See merge request pleroma/pleroma!1559
2019-08-13 22:51:15 +00:00
c3a54cc34d
Merge branch 'feature/mrf-describe' into 'develop'
...
MRF describe API
See merge request pleroma/pleroma!1561
2019-08-13 22:46:19 +00:00
83a3de8cc4
Merge branch 'length-limit-bio' into 'develop'
...
Add configurable length limits for `User.bio` and `User.name`
See merge request pleroma/pleroma!1515
2019-08-13 22:40:13 +00:00
abfbcfdcb3
mrf_vocabulary: add describe API support
2019-08-13 22:39:26 +00:00
4244e17de0
fix credo
2019-08-13 22:36:24 +00:00
47c20ab796
Merge branch 'fix/mastoapi-more-object-preloads' into 'develop'
...
Mastodon API: Preloading and normalization optimizations
See merge request pleroma/pleroma!1558
2019-08-13 22:32:49 +00:00
46d7bef7e7
Nicer formatting for safe_render errors
2019-08-14 01:15:18 +03:00
f305e97eeb
nodeinfo: use MRF.describe() instead of hardcoded MRF transparency stuff
2019-08-13 22:09:02 +00:00
c574b7a1fc
MRF: add describe() to all modules, add base MRF configuration to base describe()
2019-08-13 22:08:58 +00:00
694bc43123
MRF: add describe() for gathering and describing the MRF configuration
2019-08-13 21:26:24 +00:00
fea4d89e9f
tests for Web/ActivityPub/Relay
2019-08-13 21:12:59 +00:00
04da1166db
tests for /web/mastodon_api/mastodon_api.ex
2019-08-13 21:12:37 +00:00
3fdbeb7087
MRF: add vocabulary policy module
2019-08-13 20:55:38 +00:00
c1b6952d2a
Mastodon API: Preloading and normalization optimizations
...
- Try to normalize the activity instead of object wherever possible
- Put the `user` key on non-home timelines as well so bookmarks and
thread mutes are preloaded there as well
- Skip trying to get the user when rendering mentions if the id ==
as:Public or user's follower collection
- Preload the object when getting replied to activities and do not crash
if it's not present
This almost solves the problem of Pleroma hammering the db with a lot
of queries when rendering timelines, the things left are
1. When rendering mentions and the user is not in cache, save it for
later and request all uncached users in one go
2. Somehow get rid of needing to get the latest follow activity to
detect the value of `requested` in a relationship. (create a database
view for user relationship and cache it maybe?)
2019-08-13 20:34:34 +03:00
0e1c481a94
[ #1149 ] Added more oban workers. Refactoring.
2019-08-13 20:20:26 +03:00
f46cd7e9c7
config: remove legacy activitypub accept_blocks setting
...
Anyone who is interested in dropping blocks can write their own MRF
policy at this point. This setting predated the MRF framework.
Disabling the side effect (unsubscription) is still a config option
per policy.
2019-08-13 02:15:21 +00:00
511ccea5aa
ConversationView: Align parameter names with other views.
2019-08-12 14:23:06 +02:00
60231ec7bd
Conversation: Add endpoint to get a conversation by id.
2019-08-12 13:58:04 +02:00
23c46f7e72
Conversations: Use 'recipients' for accounts in conversation view.
...
According to gargron, this is the intended usage.
2019-08-12 12:51:08 +02:00
92479c6f48
Do not fetch the reply object in `fix_type` unless the object has the
...
`name` key and use a depth limit when fetching it
2019-08-11 22:49:55 +03:00
9cfc289594
MRF: ensure that subdomain_match calls are case-insensitive
2019-08-10 21:19:26 +00:00
84808e1697
Merge branch 'develop' into 'fix/hide-follows-counters'
...
# Conflicts:
# CHANGELOG.md
2019-08-10 18:49:04 +00:00
af4cf35e20
Strip internal fields including likes from incoming and outgoing activities
2019-08-10 18:47:40 +00:00
11d08c2de0
tests for Pleroma.Uploaders
2019-08-10 18:46:26 +00:00
33a5fc4a70
[ #1149 ] Fixed failing tests. Ensured Instance.set_unreachable/2 supports ISO 8601 datetime.
2019-08-10 20:38:31 +03:00
0802a08871
Mastodon API: Fix thread mute detection
...
It was calling CommonAPI.thread_muted? with post author's account
instead of viewer's one.
2019-08-10 16:27:46 +03:00
bb9c539580
Uploader.S3 added support stream uploads
2019-08-10 11:27:59 +00:00
dfae61c25c
Fix deactivated user deletion
2019-08-09 23:05:28 +03:00
267262491e
Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
2019-08-09 20:09:56 +03:00
b7fad8d395
[ #1149 ] Oban jobs implementation for :federator_incoming and :federator_outgoing queues.
2019-08-09 20:08:01 +03:00
409bcad54b
Mastodon API: Set follower/following counters to 0 when hiding
...
followers/following is enabled
We are already doing that in AP representation, so I think we should do
it here as well for consistency.
2019-08-09 16:53:55 +03:00
29807ef6a5
Merge branch 'feature/digest-email' into 'develop'
...
Feature/digest email
See merge request pleroma/pleroma!1078
2019-08-08 14:38:33 +00:00
a2b98f6d58
Merge remote-tracking branch 'origin/develop' into pleroma-conversations
2019-08-08 16:04:20 +02:00
9c0da1009a
Return profile URL in MastodonAPI's `url` field
2019-08-07 21:40:53 +00:00
089d53a961
Simplify logic to mention.js `url` field
...
`User.profile_url` already fallbacks to ap_id
2019-08-07 20:55:37 +00:00
a10c840aba
Return profile URL when available instead of actor URI for MastodonAPI mention URL
...
Fixes #1165
2019-08-07 20:29:30 +00:00
aa718ab8f6
Merge branch 'fix/object-reembeds' into 'develop'
...
Do not rembed the object after updating it
Closes #1142
See merge request pleroma/pleroma!1538
2019-08-06 22:14:00 +00:00
4f1b9c54b9
Do not rembed the object after updating it
2019-08-07 01:02:29 +03:00
03ad31328c
OStatus Announce Representer: Do not depend on the object being embedded
...
in the Create activity
2019-08-07 00:23:58 +03:00
73d8d5c49f
Stop depending on the embedded object in restrict_favorited_by
2019-08-07 00:12:42 +03:00
139b196bc0
[ #1150 ] fixed parser TwitterCard
2019-08-06 20:19:28 +00:00
e4a01d253e
Conversation: Rename function to better express what it does.
2019-08-06 15:06:19 +02:00
a49c92f6ae
Participation: Setting recipients will always add the owner.
2019-08-06 14:51:17 +02:00
bdc9a7222c
tests for CommonApi/Utils
2019-08-05 15:37:05 +00:00
d6fe220e32
Linting.
2019-08-05 16:11:23 +02:00
b64b6fee2a
CommonAPI: Replies to conversations also get the correct context id.
2019-08-05 15:33:22 +02:00
3af6d14da7
Pleroma Conversations API: Add a way to set recipients.
2019-08-05 15:09:19 +02:00
96028cd585
Remove Reply-To from report emails
2019-08-04 22:24:50 +00:00
f7fc902c29
Merge branch 'feature/relay-list-task' into 'develop'
...
tasks: relay: add list task
Closes #1101
See merge request pleroma/pleroma!1528
2019-08-04 17:14:37 +00:00
e8ad116c2a
Do not add the "next" key to likes.json if there is no more items
2019-08-04 17:13:06 +00:00
cef3af5536
tasks: relay: add list task
2019-08-03 23:17:17 +00:00
a035ab8c1d
templates/layout/app.html.eex: Style anchors
...
[ci skip]
2019-08-03 23:18:22 +02:00
86fffe9c27
Merge branch 'patch-2' into 'develop'
...
Add preferredUsername to service actors so Mastodon can resolve them
See merge request pleroma/pleroma!1526
2019-08-03 18:55:09 +00:00
1fce56c7df
Refactor
2019-08-03 18:37:20 +00:00
16cfb89240
Only add `preferredUsername` to service actor json when the underlying user actually has a username
2019-08-03 18:28:08 +00:00
de0f3b73dd
Admin fixes
2019-08-03 18:16:09 +00:00
040347b248
Remove spaces from the domain search
2019-08-03 18:13:20 +00:00
8b2fa31fed
Handle MRF rejections of incoming AP activities
2019-08-03 18:12:38 +00:00
a187dbb326
Add preferredUsername to service actors so Mastodon can resolve them
2019-08-03 17:24:57 +00:00
8815f07058
tasks/pleroma/user.ex: Fix documentation of --max-use and --expire-at
...
Closes: https://git.pleroma.social/pleroma/pleroma/issues/1155
[ci skip]
2019-08-02 23:38:02 +02:00
eee98aaa73
Pleroma API: Add endpoint to get conversation statuses.
2019-08-02 19:53:08 +02:00
d93d777915
Fix/mediaproxy whitelist base url
2019-08-02 17:07:09 +00:00
9d4f34fbcb
Merge branch 'develop' into feature/digest-email
2019-08-02 18:16:04 +03:00
56b1c3af13
CommonAPI: Extend api with conversation replies.
2019-08-02 15:05:27 +02:00
5ff8f07ca9
Merge branch 'feature/hide-follows-remote' into 'develop'
...
Refactor Follows/Followers counter syncronization and set hide_followers/hide_follows for remote users
See merge request pleroma/pleroma!1411
2019-08-02 11:23:07 +00:00
f88560accd
Conversations: Add recipient list to conversation participation.
...
This enables to address the same group of people every time.
2019-08-02 11:55:41 +02:00
23d279e03e
[ #1149 ] Replaced RetryQueue with oban-based retries.
2019-08-01 17:28:00 +03:00
9ca4506355
Add configurable length limits for `User.bio` and `User.name`
2019-08-01 15:53:37 +07:00
6c06529cd4
Merge branch 'fix/disallow-ostatus-follows-locked' into 'develop'
...
Disallow following locked accounts over OStatus
See merge request pleroma/pleroma!1512
2019-07-31 19:13:56 +00:00
813c686dd7
Disallow following locked accounts over OStatus
2019-07-31 22:05:12 +03:00
6eb33e7303
test for Pleroma.Web.CommonAPI.Utils.get_by_id_or_ap_id
2019-07-31 18:35:15 +00:00
f72e0b7cad
ostatus: explicitly disallow protocol downgrade from activitypub
...
This closes embargoed bug #1135 .
2019-07-31 18:17:31 +00:00
301ea0dc04
Add tests for counters being updated on follow
2019-07-31 21:09:13 +03:00
58443d0cd6
tests for TwitterApi/UtilController
2019-07-31 15:14:36 +00:00
7483679a7b
StatusView: Return direct conversation id.
2019-07-31 15:12:29 +02:00
f42719506c
Fix credo issues
2019-07-31 14:20:34 +03:00
c88a5d3251
Merge branch 'develop' into feature/hide-follows-remote
2019-07-31 14:12:29 +03:00
51b3b6d816
Admin changes
2019-07-30 16:36:05 +00:00
3850812503
twitter api: utils: rework do_remote_follow() to use CommonAPI
...
Closes #1138
2019-07-29 20:00:57 +00:00
5835069215
Revert "Merge branch 'bugfix/clean-up-markdown-rendering' into 'develop'"
...
This reverts merge request !1504
2019-07-29 19:42:26 +00:00
5795a890e9
markdown: clean up html generated by earmark
2019-07-29 19:09:58 +00:00
1dfde4151c
Merge branch 'refactor/use-constants' into 'develop'
...
refactoring: begin to use constants
See merge request pleroma/pleroma!1500
2019-07-29 16:30:47 +00:00
0bee2131ce
Add `mailerEnabled` to the NodeInfo metadata
2019-07-29 16:17:40 +00:00
c0e258cf21
Redirect not logged-in users to the MastoFE login page on private instances
2019-07-29 16:17:22 +00:00
159bbec570
added tests for OstatusController
2019-07-29 05:02:20 +00:00
b93498eb52
constants: add as_public constant and use it everywhere
2019-07-29 02:43:19 +00:00
492d854e7a
transmogrifier: use User.delete() instead of handrolled user deletion code for remote users
...
Closes #1104
2019-07-28 21:32:04 +00:00
242f5c585e
add account confirmation email resend in mastodon api
2019-07-28 20:30:10 +00:00
6a4b8b2681
fixed User.update_and_set_cache for stale user
2019-07-28 20:29:26 +00:00
488c06b6f5
Merge branch 'develop' into 'develop'
...
Fix HTTP sig tweak on KeyId
See merge request pleroma/pleroma!1496
2019-07-28 20:25:35 +00:00
02dc651828
Handle 303 redirects
2019-07-28 20:24:39 +00:00
961e778531
Fix HTTP sig tweak on KeyId
2019-07-28 14:17:56 +02:00
6b77a88365
[ #1097 ] added redirect: /pleroma/admin -> /pleroma/admin/
2019-07-26 20:27:38 +00:00
41e0304757
Merge branch 'develop' into feature/hide-follows-remote
2019-07-25 18:43:30 +03:00
19835be067
Merge branch 'fix-remote-follow-from-ostatus-subscribe' into 'develop'
...
Fix remote follow from /ostatus_subscribe
Closes #1103
See merge request pleroma/pleroma!1472
2019-07-24 19:29:01 +00:00
b20020da16
Show the url advertised in the Activity in the Status JSON response
2019-07-24 19:28:21 +00:00
84fca14c3c
Do not prepend /media/ when using base_url
...
This ensures admin has full control over the path where media resides.
2019-07-24 15:35:25 +00:00
ac27b94ffa
Change to not require `magic-public-key` on WebFinger
2019-07-25 00:21:32 +09:00
55341ac717
tests WebFinger
2019-07-24 15:13:10 +00:00
4504135894
Add `domain_blocking` to the relationship API (GET /api/v1/accounts/relationships)
2019-07-24 15:12:27 +00:00
2c83eb0b15
Revert "squash! Expose expires_at datetime in mastoAPI only for the activity actor"
...
This reverts commit 2981821db8
2019-07-24 17:09:59 +02:00
2981821db8
squash! Expose expires_at datetime in mastoAPI only for the activity actor
...
NOTE: rewrite the commit msg
2019-07-24 16:51:09 +02:00
d2da3d30f3
Merge branch 'develop' into feature/digest-email
2019-07-24 16:37:52 +03:00
3cb471ec06
Expose expires_at datetime in mastoAPI only for the activity actor
...
In the "pleroma" section of the MastoAPI for status activities you can
see an expires_at item that states when the activity will expire, or
nothing if the activity will not expire.
The expires_at date is only visible to the person who posted the
activity. This is the conservative approach in case some attacker
decides to write a logger for expiring posts. However, in the future of
OCAP, signed requests, and all that stuff, this attack might not be that
likely. Some other pleroma dev should remove the restriction in the code
at that time, if they're satisfied with the security implications of
doing so.
2019-07-24 14:47:22 +02:00
36012ef6c1
Require that ephemeral posts live for at least one hour
...
If we didn't put some kind of lifetime requirement on these, I guess you
could annoy people by sending large numbers of ephemeral posts that
provoke notifications but then disappear before anyone can read them.
2019-07-24 14:46:08 +02:00
704960b3c1
Add support for activity expiration to common and Masto API
...
The "expires_at" parameter accepts an ISO8601-formatted date which
defines when the activity will expire.
At this point the API will not give you any feedback about if your post
will expire or not.
2019-07-24 14:45:14 +02:00
378f5f0fbe
Add activity expiration worker
...
This is a worker that runs every minute and deletes expired activities.
It's based heavily on the scheduled activities worker.
2019-07-24 13:14:52 +02:00
666514194a
Add activity expirations table
...
Add a table to store activity expirations. An activity can have zero or
one expirations. The expiration has a scheduled_at field which stores
the time at which the activity should expire and be deleted.
2019-07-24 13:14:52 +02:00
f5d574f4ed
check both item and parent domain blocks
2019-07-24 11:35:16 +01:00
48bd3be9cb
move domain block check to with block
2019-07-24 11:11:33 +01:00
4af4f6166b
honour domain blocks on streaming notifications
2019-07-24 11:09:06 +01:00
9c6357324e
Merge branch 'feature/admin-api-user-statuses' into 'develop'
...
Admin API: Endpoint for fetching latest user's statuses
See merge request pleroma/pleroma!1413
2019-07-23 23:59:21 +00:00
d3bdb8e704
rich media: parser: splice the given URL into the result
2019-07-23 23:51:29 +00:00
f46805bb40
Merge branch 'develop' into feature/admin-api-user-statuses
2019-07-24 02:42:28 +03:00
03471151d6
AdminAPI: Add "godmode" while fetching user statuses (i.e. admin can see private statuses)
2019-07-24 01:51:36 +03:00
bd265acf91
Merge branch 'chore/adminapi-deprecated-endpoints' into 'develop'
...
Router: Remove deprecated AdminAPI endpoints
See merge request pleroma/pleroma!1466
2019-07-23 19:48:34 +00:00
90be91b0e0
Router: Remove deprecated AdminAPI endpoints
2019-07-23 21:35:25 +02:00
5e72554f3c
Admin config fix
2019-07-23 19:17:00 +00:00
c49a09ed88
tests for Pleroma.Web.ActivityPub.Publisher
2019-07-23 19:15:48 +00:00
8d3cf7e519
Merge branch 'bugfix/unauthed-liked-by' into 'develop'
...
Bugfix: don't error out on unauthorized request to liked/favourited_by
See merge request pleroma/pleroma!1474
2019-07-23 19:14:43 +00:00
03d89e182e
Merge branch 'fix/subscriber-notifications' into 'develop'
...
Do not notify subscribers for messages from users which are replies to others
See merge request pleroma/pleroma!1477
2019-07-23 19:13:55 +00:00
6a79bb12c3
Fix function
2019-07-23 13:53:05 -05:00
54a161cb7a
move unauth'd user blocks?/2 check
2019-07-23 19:44:47 +01:00
fd287387a0
Do not notify subscribers for messages from users which are replies to others
2019-07-23 13:14:26 -05:00
e7c64f106e
signature: properly deduce the actor from misskey key IDs
2019-07-23 16:47:22 +00:00
452980652d
Mix format
2019-07-23 15:13:05 +01:00
eacf61d823
fix unauthenticated req to favourited/rebloggd_by
2019-07-23 15:08:33 +01:00
e818381042
Use User.get_or_fetch/1 instead of OStatus.find_or_make_user/1
2019-07-23 19:47:27 +09:00
b70e659304
Feature/1087 wildcard option for blocks
2019-07-22 14:33:58 +00:00
674ad5e1df
Merge branch 'hardening/stop-misusing-sharedinbox' into 'develop'
...
activitypub: publisher: align sharedinbox usage with AP specification rules
See merge request pleroma/pleroma!1464
2019-07-22 11:01:35 +00:00
f712ee879a
Bugfix: muted/blocked user notification streaming
2019-07-22 02:43:55 +00:00
05b5af8075
Add tests for users tasks and PleromaAuthenticator
2019-07-22 02:43:15 +00:00
a5d6287ba8
Hide blocked users from interactions
2019-07-22 02:42:29 +00:00
56019d53a8
activitypub: publisher: align sharedinbox usage with AP specification rules
...
While debugging the follow breakage, I observed that our sharedInbox usage
did not match the rules in the specification. Accordingly, I have better
aligned our usage of sharedInbox with the rules outlined in the ActivityPub
specification.
2019-07-22 02:38:31 +00:00
a00aab3402
Merge branch 'fix/rich-media-ttl-fallback' into 'develop'
...
Fix rich media parser failing when no TTL can be found by image TTL setters
See merge request pleroma/pleroma!1460
2019-07-21 16:05:58 +00:00
3368174785
Fix rich media parser failing when no TTL can be found by image TTL
...
setters
2019-07-21 18:22:22 +03:00
bc6c5c513a
router: ensure the AP sharedinbox path is registered first
2019-07-21 03:52:06 +00:00
196cad46f3
Resolve merge conflicts
2019-07-20 22:04:47 +03:00
c3ecaea64d
Apply suggestion to lib/pleroma/object/fetcher.ex
2019-07-20 18:53:00 +00:00
d4ee76ab63
Apply suggestion to lib/pleroma/user.ex
2019-07-20 18:52:41 +00:00
8292331b35
Merge branch 'develop' into feature/digest-email
2019-07-20 16:41:58 +03:00
d0198fe215
[ #1112 ] Preserving `id` on user insert conflict on order not to violate conversation_partipations_user_id_fkey constraint.
2019-07-20 13:03:34 +03:00
ae4fc58589
Remove flavour from userinfo
2019-07-20 01:24:01 +03:00
36049f08ef
Merge develop
2019-07-20 01:03:25 +03:00
93df0796f0
Merge branch 'feature/matstodon-statuses-by-name' into 'develop'
...
Feature/matstodon statuses by name
See merge request pleroma/pleroma!1211
2019-07-19 21:59:18 +00:00
9169f331b6
Merge branch 'develop' into feature/matstodon-statuses-by-name
2019-07-19 16:55:10 -05:00
33729bbb28
Merge branch 'feature/richmedia-ttl' into 'develop'
...
add the rich media ttl based on image exp time
See merge request pleroma/pleroma!1438
2019-07-19 21:36:36 +00:00
9a8eb2c94d
mix: add pleroma.user unsubscribe_all_from_instance
2019-07-19 19:25:29 +00:00
716afc83ce
Merge branch 'refactor/http-signature-plug' into 'develop'
...
http signature plug: separation of concerns
See merge request pleroma/pleroma!1449
2019-07-19 16:57:24 +00:00
c2e2aadc42
#1110 fixed /api/pleroma/healthcheck
2019-07-19 16:20:23 +00:00
de9906ad56
change the structure of image ttl parsar
2019-07-19 11:43:42 +05:45
9570a5be40
Merge branch 'develop' into feature/admin-api-user-statuses
2019-07-18 23:38:38 +03:00
c947cfec5a
mapped signature plug: use `user` assign like authentication plug
2019-07-18 20:31:25 +00:00
f435217e50
tests for Plugs.AuthenticationPlug
2019-07-18 20:29:51 +00:00
a8af0ac053
mapped signature plug: fix user lookup
2019-07-18 16:27:50 +00:00
5ea0cd69f7
mapped signature plug: don't invalidate in cases where a signature is actually not present (testsuite)
2019-07-18 16:01:21 +00:00
184fa61fb3
plugs: add MappedSignatureToIdentityPlug
2019-07-18 15:38:45 +00:00
18d8d12d53
signature: make key_id_to_actor_id() public
2019-07-18 15:35:42 +00:00
88d064d80e
http signature plug: remove redundant checks handled by HTTPSignatures library
...
the redundant checks assumed a POST request, which will not work for signed GETs.
this check was originally needed because the HTTPSignatures adapter assumed that
the requests were also POST requests. but now, the adapter has been corrected.
2019-07-18 15:11:21 +00:00
f9a0014681
Merge branch 'feature/signed-object-fetches' into 'develop'
...
signed object fetches
See merge request pleroma/pleroma!1446
2019-07-18 13:27:50 +00:00
b6b748d3e7
tests for Uploader with webhook
2019-07-18 12:30:18 +00:00
399acd4c42
fetcher: sign object fetches if configured
2019-07-17 22:58:46 +00:00
1e48af9acf
Merge branch 'feature/instance-fetch-actor' into 'develop'
...
instance fetch service actor
See merge request pleroma/pleroma!1440
2019-07-17 19:45:40 +00:00
60b54ee64a
Merge branch 'feature/http-signatures-keyid' into 'develop'
...
http signatures: derive actor from key IDs
See merge request pleroma/pleroma!1442
2019-07-17 19:44:14 +00:00
f84fb340b7
http signatures: derive actor ID from key ID.
...
Almost all AP servers return their key ID as the actor URI with #main-key
added. Hubzilla, which doesn't, uses a URL which refers to the actor
anyway, so worst case, Hubzilla users get refetched.
2019-07-17 19:18:19 +00:00
4bf2bb9cff
Fix password reset for non-test env
...
Fixes `Plug.Conn.NotSentError` that causes a 5xx error in response
instead of 404 and 400.
Fixes pattern matching error caused by different response format
in test and non-test env: `Pleroma.Emails.Mailer.deliver_async` returns
:ok when PleromaJobQueue is enabled and `{:ok, _}` when it's disabled.
In tests, it's disabled.
2019-07-17 18:09:31 +00:00
cf9cb953d5
activitypub: represent internal fetch actor
2019-07-17 17:34:57 +00:00
d930e5d5c3
activitypub: introduce internal fetch service actor
2019-07-17 17:14:08 +00:00
62e5ff624e
user: add is_internal_user? helper function
2019-07-17 17:12:42 +00:00
0a6f6e1b5b
webfinger: allow resolution of usernames with dots in them (internal actors)
2019-07-17 16:59:29 +00:00
a9d6a12bb3
activitypub: controller: rework the way the relay actor is presented so the code can be reused
2019-07-17 16:33:08 +00:00
4885473be2
user: refactor get_or_create_instance_user() into get_or_create_service_actor_by_id()
2019-07-17 16:03:05 +00:00
ce73d5f6a5
Merge branch 'feature/mention-mrf' into 'develop'
...
Add MRF MentionPolicy for dropping posts which mention specific actors
See merge request pleroma/pleroma!1439
2019-07-17 15:28:41 +00:00
96a2890a9e
Add MRF MentionPolicy for dropping posts which mention specific actors
2019-07-17 15:16:55 +01:00
10f82c88b8
mastoapi password reset
...
added rate limit to password reset
configure rate limit in runtime
2019-07-16 21:44:50 +00:00
21e3f9ac69
added tests for Pleroma.Upload.Filter
2019-07-16 21:35:43 +00:00
18234cc44e
add the rich media ttl based on image exp time
2019-07-17 00:20:34 +05:45
889dc17abd
[ #1094 ] Rate-limited follow & unfollow actions.
2019-07-16 19:18:30 +03:00
e7c175c943
Use PleromaJobQueue for scheduling
2019-07-16 16:49:50 +03:00
9bca70b10a
Merge develop
2019-07-16 16:19:19 +03:00
520ee6c591
Add `pleroma.deactivated` to the Account entity (Mastodon API)
2019-07-16 11:14:46 +00:00
c4ca142e14
Add the `blocked_by` attribute to the relationship API (`GET /api/v1/accounts/relationships`)
2019-07-16 11:04:11 +00:00
70439494af
Fix typo
2019-07-16 14:56:07 +07:00
996fd58ac4
Merge branch 'bugfix/poll-id-as-string' into 'develop'
...
Status View: Poll ids are strings.
See merge request pleroma/pleroma!1430
2019-07-16 06:06:22 +00:00
1ed24bcc76
Status View: Poll ids are strings.
...
All ids in mastodon are strings, in general.
2019-07-16 12:47:40 +09:00
ffb4eb9779
Merge branch 'develop' into feature/matstodon-statuses-by-name
2019-07-15 17:10:27 -05:00
9f987dd017
Merge branch 'match-file-name' into 'develop'
...
try to always match the filename for proxy url
See merge request pleroma/pleroma!1405
2019-07-15 22:04:58 +00:00
b74300bc7a
Add more tests for MastodonAPIController and CommonAPI
2019-07-15 19:47:23 +00:00
33fd4c0ed7
query fix
2019-07-15 20:53:52 +03:00
ee5250ae56
Merge branch 'sha512-crypt' into 'develop'
...
detect and use sha512-crypt for stored password hash.
See merge request pleroma/pleroma!1422
2019-07-15 16:13:17 +00:00
1d906ffa82
Merge branch 'develop' into match-file-name
...
# Conflicts:
# lib/pleroma/web/media_proxy/media_proxy_controller.ex
2019-07-15 21:30:56 +05:45
105f437ce9
formatting
2019-07-15 08:36:51 -07:00
03c4ea44ad
Merge branch 'admin-configure-atom-keys' into 'develop'
...
admin configure - atom keys with leading :
See merge request pleroma/pleroma!1424
2019-07-15 13:01:58 +00:00
c32384c1ea
tests for Pleroma.Signature
2019-07-15 13:01:22 +00:00
b8607c151c
migrating task refactor
2019-07-15 15:45:27 +03:00
c66044b923
atom keys with leading :
2019-07-15 11:00:55 +03:00
de13c9bb8f
List messages must be visible for mentioned users
2019-07-15 14:54:40 +07:00
d86a97abfb
Add an explanation comment to Publisher.publish/2
2019-07-15 14:20:31 +07:00
64a946643e
Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists
2019-07-15 14:11:54 +07:00
a87c313309
Support `list` visibility in StatusView
2019-07-15 14:00:29 +07:00
fa17879c20
added tests for Web.MediaProxy
2019-07-14 21:01:32 +00:00
b052a9d4d0
Update DigestEmailWorker to compile and send emails via queue
2019-07-14 22:32:11 +03:00
dce8ebc9ea
Unfollow should also unsubscribe
2019-07-14 19:25:03 +00:00
168dc97c37
Make opts optional in Pleroma.Notification.for_user_query/2
2019-07-14 22:04:55 +03:00
c729883936
Merge branch 'develop' into feature/digest-email
2019-07-14 21:43:30 +03:00
739bbe0d3b
security: detect object containment violations at the IR level
...
It is more efficient to check for object containment violations at the IR
level instead of in the protocol handlers. OStatus containment is especially
a tricky situation, as the containment rules don't match those of IR and
ActivityPub.
Accordingly, we just always do a final containment check at the IR level
before the object is added to the IR object graph.
2019-07-14 17:47:08 +00:00
f98f7ad1b9
detect and use sha512-crypt for stored password hash.
2019-07-14 09:48:42 -07:00
cef4337f95
Merge branch 'bugfix/llal-object-containment' into 'develop'
...
Object.Fetcher: Handle error on Containment.contain_origin/2
See merge request pleroma/pleroma!1414
2019-07-14 16:39:17 +00:00
2592934480
Object.Fetcher: Keep the with-do block as per kaniini proposition
2019-07-14 17:28:25 +02:00
e1c08a67d6
Object.Fetcher: Fallback to OStatus only if AP actually fails
2019-07-14 17:05:31 +02:00
e7c39b7ac8
Feature/1072 muting notifications
2019-07-14 13:29:31 +00:00
40d0a198e2
Object.Fetcher: Handle error on Containment.contain_origin/2
2019-07-14 14:58:47 +02:00
f4447d82b8
parsers configurable
2019-07-14 09:21:56 +03:00
0c2dcb4c69
Add follow information refetching after following/unfollowing
2019-07-14 01:58:39 +03:00
183da33e00
Add tests for fetch_follow_information_for_user and check object type
...
when fetching the page
2019-07-14 00:56:02 +03:00
418ae6638d
Merge branch 'develop' into feature/admin-api-user-statuses
2019-07-14 00:39:06 +03:00
a9459ff98f
Admin API: Endpoint for fetching latest user's statuses
2019-07-14 00:37:26 +03:00
d06d1b751d
Use atoms when updating user info
2019-07-14 00:21:35 +03:00
e5b850a991
Refactor fetching follow information to a separate function
2019-07-13 23:56:10 +03:00
80c46d6d8b
nodeinfo: implement MRF transparency exclusions
2019-07-13 18:53:14 +00:00
e8fa477793
Refactor Follows/Followers counter syncronization
...
- Actually sync counters in the database instead of info cache (which got
overriden after user update was finished anyway)
- Add following count field to user info
- Set hide_followers/hide_follows for remote users based on http status
codes for the first collection page
2019-07-13 19:27:49 +03:00
f4c001062e
Merge branch '1041-status-actions-rate-limit' into 'develop'
...
Rate-limited status actions (per user and per user+status).
Closes #1041
See merge request pleroma/pleroma!1410
2019-07-13 14:17:17 +00:00
d72876c57d
[ #1041 ] Minor refactoring.
2019-07-13 15:21:50 +03:00
9497d14f09
Merge branch 'fix/hackney-global-options' into 'develop'
...
Merge the default options with custom ones in ReverseProxy and Pleroma.HTTP and workaround for remote server certificate chain issues
See merge request pleroma/pleroma!1409
2019-07-13 11:55:09 +00:00
369e9bb42f
[ #1041 ] Rate-limited status actions (per user and per user+status).
2019-07-13 14:49:39 +03:00
b001b8891a
Merge the default options with custom ones in ReverseProxy and
...
Pleroma.HTTP
2019-07-12 23:52:26 +03:00
095117a58c
Merge branch 'develop' into fix/ap-hide-follows
2019-07-12 21:43:06 +03:00
97b79efbcd
ActivityPub Controller: Actually pass for_user to following/followers
...
views and give 403 errors when trying to request hidden follower pages
when unauthenticated
2019-07-12 20:54:20 +03:00
f8e3ae6154
try to always match the filename for proxy url
2019-07-12 22:56:14 +05:45
92055941bd
Pleroma.Web.Metadata - tests
2019-07-12 16:42:54 +00:00
1f6ac7680d
ActivityPub User view: Following/Followers refactoring
...
- Render the collection items if the user requesting == the user
rendered
- Do not render the first page if hide_{followers,follows} is set, just
give the URI to it
2019-07-12 19:41:55 +03:00
360e4cdaa2
Move these to pleroma namespace in Mastodon API
2019-07-12 11:25:58 -05:00
6a6c4d134b
preserve the original path/filename (no encoding/decoding) for proxy
2019-07-12 21:05:01 +05:45
eae991b06a
merge develop
2019-07-12 18:08:27 +03:00
4198c3ac39
Extend Pleroma.Pagination to support offset-based pagination, use async/await to execute status and account search in parallel
2019-07-11 13:55:31 +00:00
846ad9a463
admin api configure changes
2019-07-11 13:02:13 +00:00
e4e3fd7e55
Merge branch 'fix/1019-refactor' into 'develop'
...
Fix/1019 refactor
See merge request pleroma/pleroma!1397
2019-07-11 13:01:11 +00:00
9e06873d58
Add `list` to Visibility
2019-07-11 19:29:24 +07:00
958fb9aa80
Add "listMessage"
2019-07-11 16:36:08 +07:00
182f7bbb11
Merge branch 'develop' into feature/addressable-lists
2019-07-11 13:26:59 +07:00
a237c6a2d4
support for idna domains
2019-07-10 15:23:25 +00:00
252e129b1e
MastoAPI: Add categories to custom emojis
...
Note: This isn’t in a release yet, can be seen in mastofe on the
rebase/glitch-soc branch.
2019-07-10 17:02:37 +02:00
beba7bbc85
removing synchronization worker
2019-07-10 17:42:18 +03:00
f8786fa6f2
adding following_address field to user
2019-07-10 17:42:18 +03:00
ff55e3c16f
Create mentions only for explicitly mentioned users
2019-07-10 13:29:50 +00:00
ed8ce21a22
Fix unused import warning
2019-07-10 18:10:09 +07:00
a42da8f311
Fix response
2019-07-10 18:10:09 +07:00
5104f65b69
Wrap error messages into gettext helpers
2019-07-10 18:10:09 +07:00
26a6871609
Add translation helpers
2019-07-10 18:10:09 +07:00
0d54a571ca
Add SetLocalePlug
2019-07-10 18:08:03 +07:00
008c55e4e9
add test for search_controller/ 100% coverage
2019-07-10 08:28:03 +00:00
12b1454245
[ #1062 ] added option to disable send email
2019-07-10 05:34:21 +00:00
2d2b50ccca
Send and handle "Delete" activity for deleted users
2019-07-10 05:16:08 +00:00
75be90a6d1
Merge branch 'release/listener' into 'develop'
...
add listener port and ip option for 'pleroma.instance gen' and enable its test
See merge request pleroma/pleroma!1393
2019-07-10 05:14:08 +00:00
93a0eeab16
Add license/copyright to all project files
2019-07-10 05:13:23 +00:00
bb8065a1fd
tests MRF filters
2019-07-10 05:12:21 +00:00
6d0ae264fc
add listener port and ip option for 'pleroma.instance gen' and enable its test
2019-07-10 01:46:49 +05:45
829e997223
[ #878 ] Merge remote-tracking branch 'remotes/upstream/develop' into 878-activity-object-decoupling-in-tests
...
# Conflicts:
# lib/pleroma/object.ex
# test/web/activity_pub/transmogrifier_test.exs
# test/web/ostatus/ostatus_test.exs
2019-07-09 21:46:16 +03:00
371d39e160
Merge develop
2019-07-09 21:21:09 +03:00
670a77ecbc
Merge branch 'feature/allow-user-query-via-id' into 'develop'
...
Admin API: Allow querying user by ID
See merge request pleroma/pleroma!1380
2019-07-09 17:53:41 +00:00
1417627d07
Merge branch 'remove-avatar-header' into 'develop'
...
Ability to reset avatar, profile banner and backgroud
See merge request pleroma/pleroma!1187
2019-07-09 17:51:41 +00:00
9a9b60cfbc
Merge branch 'develop' into feature/allow-user-query-via-id
2019-07-09 12:49:04 -05:00
d6b0fce6e9
Fix/1019 correct count remote users
2019-07-09 17:36:35 +00:00
4948117fcf
Merge branch 'remove-swift' into 'develop'
...
Remove Uploaders.Swift and `httpoison` dependency
Closes #1051
See merge request pleroma/pleroma!1374
2019-07-09 16:54:32 +00:00
4e6e5d8042
reverse proxy tests
2019-07-09 16:54:13 +00:00
1179a13533
Merge branch 'features/sec-websocket-protocol-header' into 'develop'
...
Features: MastoAPI streaming Sec-WebSocket-Protocol header
See merge request pleroma/pleroma!1381
2019-07-09 16:52:22 +00:00
1ab4e35f27
Merge branch 'enable-ogp-by-default' into 'develop'
...
Do not crash if metadata fails to render and enable OGP and TwitterCard by default
Closes #1034
See merge request pleroma/pleroma!1388
2019-07-09 16:07:20 +00:00
167f810ff1
Merge branch 'proxy-error' into 'develop'
...
make sure the url used by proxy is same as original url
See merge request pleroma/pleroma!1383
2019-07-09 16:00:44 +00:00
95c085174d
Merge branch 'test-speedup' into 'develop'
...
Testing: Don't federate in testing.
See merge request pleroma/pleroma!1391
2019-07-09 15:35:28 +00:00
31a59d6f23
Merge branch 'develop' into proxy-error
2019-07-09 10:18:30 -05:00
376a55c97f
Merge branch '161-incoming-replies-depth-limit' into 'develop'
...
[#161 ] Limited replies depth on incoming federation (memory leaks fix)
Closes #161
See merge request pleroma/pleroma!1361
2019-07-09 14:15:10 +00:00
23d4781e73
change for local user search
2019-07-09 08:52:49 +00:00
abe2e8881f
Testing: Don't federate in testing.
2019-07-09 15:30:51 +09:00
daff85a985
[ #878 ] Refactored assumptions on embedded object presence in tests. Adjusted note factory to not embed object into activity.
2019-07-08 19:53:02 +03:00
44b2e1fdad
Formatting
2019-07-08 14:05:57 +03:00
9e58d3c624
FallbackRedirector: Do not crash on Metadata rendering errors
2019-07-08 12:59:49 +03:00
7f609ee8f4
OGP/TwitterCard: Add fallbacks in case the attachment key is nonexistent
2019-07-08 12:16:32 +03:00
72b88c82bc
Mastodon API: Fix embedded relationships not being rendered inside of statuses
2019-07-08 12:07:08 +03:00
f5ad430974
make sure the url used by proxy is same as origin url
...
encoding or decoding it breaks some of the signed url
2019-07-07 14:13:40 +05:45
e174614eb9
MastoAPI Streaming: Keep compatibility with access_token
2019-07-07 08:49:29 +02:00
a7885748c7
MastoAPI streaming: Replace access_token with Sec-WebSocket-Protocol
2019-07-06 20:29:17 +02:00
ad8d86e7c6
Merge remote-tracking branch 'remotes/upstream/develop' into 161-incoming-replies-depth-limit
2019-07-06 10:17:06 +03:00
3589b30ddc
Merge branch 'fix/1058-uploads-dir-consistency' into 'develop'
...
tasks/pleroma/instance.ex: Change :upload_dir to :uploads_dir
Closes #1058
See merge request pleroma/pleroma!1378
2019-07-05 18:55:27 +00:00
6c50fbcd14
Admin API: Allow querying user by ID
2019-07-05 19:33:53 +03:00
6dadf5d6f4
[ #1043 ] fix search accounts.
2019-07-05 04:22:08 +00:00
977c2d0448
tasks/pleroma/instance.ex: Change :upload_dir to :uploads_dir
...
Closes: https://git.pleroma.social/pleroma/pleroma/issues/1058
2019-07-05 06:19:27 +02:00
15eb1235ed
Expose `skip_thread_containment` in nodeinfo
2019-07-03 18:35:57 +00:00
5184b0f41a
Use fallback values for search queries
...
This is to make sure the entire request doesn't return a 500 error if
user or status search times out.
2019-07-03 10:19:51 +00:00
4f42093220
Remove Uploaders.Swift
2019-07-03 14:11:04 +07:00
ab50c6b3ca
Add fallback value to the admin report view.
...
This is to avoid 500 error when the reported user no longer exists
in the database.
2019-07-02 01:27:00 +00:00
d2cb18b2a3
Merge branch 'develop' into feature/digest-email
2019-06-30 21:23:35 +03:00
a799418573
[ #161 ] Merge remote-tracking branch 'remotes/upstream/develop' into 161-incoming-replies-depth-limit
...
# Conflicts:
# CHANGELOG.md
2019-06-30 16:05:00 +03:00
2b9d914089
[ #161 ] Refactoring, documentation.
2019-06-30 15:58:50 +03:00
1f76740e10
Add hashtag filter to user statuses (GET /api/v1/accounts/:id/statuses)
2019-06-30 09:08:46 +00:00
acd20f166b
[ #1026 ] Filter.AnonymizeFilename added ability to retain file extension with custom text
2019-06-30 07:28:35 +00:00
4c60a562a7
Fix not being able to pin unlisted posts
...
Closes #1038
2019-06-29 22:27:42 +03:00
5b7b1040b3
[ #161 ] Limited replies depth on incoming federation in order to prevent memory leaks on recursive replies fetching.
2019-06-29 20:04:50 +03:00
d1549a6375
Merge branch 'feature/merge-mastodon-admin-views-for-reports' into 'develop'
...
Merge admin and mastodon user views for reports
See merge request pleroma/pleroma!1346
2019-06-29 00:12:09 +00:00
034986e1fd
MRF: add mediaproxy warming policy
2019-06-28 23:19:20 +00:00
657277ffc0
Resolve conflicts
2019-06-29 00:52:50 +03:00
2286f62a36
Merge branch 'release-docs' into 'develop'
...
Docs on OTP releases
See merge request pleroma/pleroma!1315
2019-06-28 15:26:09 +00:00
452ca5250d
Merge admin and mastodon user views for reports
2019-06-28 15:15:32 +03:00
0369a5db16
Merge branch 'idempotency-plug' into 'develop'
...
Add IdempotencyPlug and use it in all of the api
Closes #1003
See merge request pleroma/pleroma!1339
2019-06-27 04:20:17 +00:00
c6705144a2
don't delete config settings on admin update
2019-06-27 04:19:44 +00:00
889a9c3a3f
Polish IdempotencyPlug
2019-06-27 01:53:58 +07:00
159630b21c
Fix credo warning
2019-06-26 19:19:07 +07:00
0b8aeac0f3
Remove previous idempotency implementation from `post_status`
2019-06-26 18:49:14 +07:00
74132e3715
Enable IdempotencyPlug for the all API
2019-06-26 18:42:49 +07:00
825077a5b0
Add Idempotency plug
2019-06-26 18:36:58 +07:00
d53fb55bb7
Return correct response when reply to a direct message is not direct itself
2019-06-26 10:59:27 +00:00
24bcc209f9
Merge branch 'refactoring/fix_render_view' into 'develop'
...
Fix Controller.render/4 deprecation
See merge request pleroma/pleroma!1337
2019-06-26 05:34:26 +00:00
9f8e645dce
Merge branch 'feature/configurable-pack-extensions' into 'develop'
...
Make default pack extensions configurable and default to png and gif
See merge request pleroma/pleroma!1338
2019-06-26 05:34:02 +00:00
41e4752950
Make default pack extensions configurable and default to png and gif
2019-06-26 06:48:59 +03:00
5c0f646cef
fix validate_page_url
2019-06-26 06:27:17 +03:00
a7a54068f9
Fix Controller.render/4 deprecation
2019-06-26 03:28:02 +03:00
4ad15ad2a9
add ignore hosts and TLDs for rich_media
2019-06-25 22:25:37 +03:00
0276cf5a02
fix validate_url for private ip
2019-06-25 17:44:24 +03:00
a0c4ebb4d7
[ #184 ] small refactoring reset password
2019-06-24 19:01:56 +00:00
2c63c67512
Rework user deletion
2019-06-24 18:59:12 +00:00
f2c03425b0
Broadcast conversation update when DM is deleted
2019-06-24 07:14:04 +00:00
27b9605de0
Merge branch 'rich_media_titles_two' into 'develop'
...
Rich media titles two
See merge request pleroma/pleroma!1325
2019-06-23 05:43:11 +00:00
8b7860f12f
Merge branch 'admin-config' into 'develop'
...
Admin config
See merge request pleroma/pleroma!1328
2019-06-23 05:42:37 +00:00
982cad0268
support for config groups
2019-06-23 08:16:16 +03:00
a0c65bbd6c
Merge branch 'develop' into 'remove-avatar-header'
...
# Conflicts:
# CHANGELOG.md
2019-06-23 03:25:50 +00:00
410add1c30
support for tuples with more than 2 values
2019-06-22 17:30:53 +03:00
0e415921cd
Rich Media Parser: Do not return just a title if nothing else is there.
2019-06-22 16:22:59 +02:00
58c4d5312b
Revert "Revert "Merge branch 'fix/ogp-title' into 'develop'""
...
This reverts commit b6af80f769
2019-06-22 15:12:57 +02:00
3ac5ecbac1
Support RUM indexes in the config generator
2019-06-22 12:54:16 +03:00
51760c84b9
Merge branch 'develop' into release-docs
2019-06-22 12:44:20 +03:00
53c73cd1a3
Merge branch 'fix/ecto-tasks-release' into 'develop'
...
Ecto tasks: Resolve relative path using the application directory instead of cwd and load the application before doing anything
See merge request pleroma/pleroma!1322
2019-06-22 09:19:10 +00:00
6426301407
notifications: fix notification generation for non-create activities
...
in 300d94c62
2019-06-22 06:44:47 +00:00
f0fccb7578
fix for int and modules
2019-06-22 09:01:30 +03:00
19f16e829d
Load the application before executing the create task
2019-06-22 04:33:46 +03:00
ebee9f59d8
Ecto tasks: Resolve relative path using the application directory
...
instead of cwd and load the application before doing anything
In OTP releases cwd != app directory and the configuration is read
only if the application is loaded
2019-06-22 04:17:04 +03:00
ee4e7c6570
Remove the getting started steps from pleroma.instance gen task
...
They are not compatible with every platform, different for OTP releases
and may become outdated. We are better off just telling people to refer
to the installation guides for their particular platform
2019-06-22 02:07:05 +03:00
452d5d3231
Merge branch 'develop' into release-docs
2019-06-22 02:00:18 +03:00
55742d978d
Merge branch 'feature/mrf-anti-link-spam' into 'develop'
...
implement anti link spam MRF
See merge request pleroma/pleroma!1307
2019-06-21 22:56:54 +00:00
e3534f5b3c
Merge branch 'oauth_secure_redirect' into 'develop'
...
OAuth security improvements (`redirect_uri` listing enforcement)
See merge request pleroma/pleroma!1302
2019-06-21 22:31:12 +00:00
720412bf24
Merge branch 'revert-6f5a0cc1' into 'develop'
...
Revert "Merge branch 'fix/ogp-title' into 'develop'"
See merge request pleroma/pleroma!1317
2019-06-21 22:28:46 +00:00
127a5a7d65
change the anti-link-spam MRF implementation to use old_user? instead of the previous name
2019-06-21 22:27:14 +00:00
e76115989a
Move config templates to priv so they can be found in releases
2019-06-21 19:54:04 +03:00
b6af80f769
Revert "Merge branch 'fix/ogp-title' into 'develop'"
...
This reverts merge request !1277
2019-06-21 11:36:32 +00:00
89fead9250
Default DB configuration to false and set the default database name to
...
`pleroma` instead of `pleroma_dev`
2019-06-21 06:42:04 +03:00
2437f51284
Merge branch 'fix/config-gen-releases' into 'develop'
...
Refactor mix tasks a bit and make config generator work with releases
See merge request pleroma/pleroma!1312
2019-06-20 21:25:34 +00:00
32320c1ee9
Fixes for dynamic configuration
2019-06-20 17:43:57 +00:00
69070e641d
Allow setting upload/static directories in the config generator
2019-06-20 03:59:16 +03:00
144e2e3e0b
Remove deprecated dedupe_media from the config template
2019-06-20 03:40:00 +03:00
fe3a830b80
Remove a useless binding from config template call
2019-06-20 02:34:19 +03:00
f8c64dd4c0
Release Tasks: Ensure the application is loaded before getting the
...
modules
Needed for non-rpc tasks to work
2019-06-20 02:21:48 +03:00
8c7a382027
Rename Pleroma.Mix.Tasks.Common -> Mix.Pleroma and import it's functions
...
instead of aliasing
This seems to be the convention for functions that can be reused between
different mix tasks in all Elixir projects I've seen and it gets rid on
an error message when someone runs mix pleroma.common
Also in this commit by accident:
- Move benchmark task under a proper namespace
- Insert a space after the prompt
2019-06-20 02:08:02 +03:00
363618207c
Apply suggestion to lib/mix/tasks/pleroma/user.ex
2019-06-19 19:39:53 +00:00
71fb75b7ef
User sign out mix task.
2019-06-19 22:29:36 +03:00
21dacd4b15
unbreak polls
2019-06-19 16:33:49 +00:00
736d8ad6be
implement anti link spam MRF
2019-06-19 15:58:32 +00:00
e4fa6b99ac
aliases for mix tasks
...
ecto.migrate
ecto.rollback
2019-06-19 10:33:33 +00:00
df2dab69a7
Merge branch 'begone-the-dot-hack' into 'develop'
...
Remove the dot hack when posting from Mastodon API and add proper errors when the post exceeds character limits
See merge request pleroma/pleroma!1298
2019-06-19 10:22:23 +00:00
5c6c4ce634
Merge branch 'fix/rich-media-hashtags-again' into 'develop'
...
Rich Media: Skip Microformats hashtags
See merge request pleroma/pleroma!1304
2019-06-19 08:48:41 +00:00
035368d363
Rich Media: Skip Microformats hashtags
...
When fixing this problem I incorrectly assumed a.hashtag is
the proper way for detecting hashtags, but it is just something Pleroma and
Mastodon add. Per microformats it should be detected by the presense of rel=tag.
This MR adds a check for rel=tag, but I still left a.hashtag just in case
2019-06-19 00:46:30 +03:00
966317e052
Merge branch 'deps/update-auto-linker' into 'develop'
...
Deps: Update auto_linker
See merge request pleroma/pleroma!1300
2019-06-18 20:47:36 +00:00
64bc7ac619
Minor edit (comment).
2019-06-18 17:15:26 +03:00
9f45f93949
Added more `redirect_uri` checks to prevent redirect to not explicitly listed URI.
2019-06-18 17:00:49 +03:00
f30a3241d2
Deps: Update auto_linker
2019-06-18 16:08:18 +03:00
c7acca2abb
Mastodon API: Sanitize display names
...
Closes #1000
2019-06-18 14:12:11 +03:00
c4e4f7d0e4
Add proper error handling for when the post exceeds character limits
2019-06-18 05:05:05 +03:00
dce27de733
Mastodon API: Remove the dot hack
2019-06-18 05:04:41 +03:00
49a49d3763
Merge branch 'removing-test-errors' into 'develop'
...
Removing test errors
See merge request pleroma/pleroma!1296
2019-06-17 14:16:23 +00:00
c34327b22e
Merge branch 'fix/sanitize-report-content' into 'develop'
...
Sanitize HTML in ReportView
Closes #990
See merge request pleroma/pleroma!1293
2019-06-16 18:05:00 +00:00
0f59265a50
salmon fix
...
removed some ownership sandbox error
2019-06-16 20:10:12 +08:00
a04bf131e0
[ #570 ] add user:notification stream
2019-06-16 10:33:25 +00:00
bf6aa6f1a8
Fix report content stopping to be nullable
2019-06-16 13:06:12 +03:00
7a4228be5a
fix for new instances
2019-06-16 10:01:15 +00:00
44de34d170
Credo fixes
2019-06-16 01:35:45 +03:00
641bcaa44e
Sanitize HTML in ReportView
...
Closes #990
2019-06-16 01:30:32 +03:00
135c196769
Merge branch 'bugfix/980-polls-double-vote' into 'develop'
...
MastodonAPI Controller: Band-Aid double vote problem.
See merge request pleroma/pleroma!1275
2019-06-15 15:13:48 +00:00
37ee6c6e2c
Merge branch 'update/phoenix-and-plug' into 'develop'
...
Update Phoenix
See merge request pleroma/pleroma!1290
2019-06-15 15:09:14 +00:00
52b1b0e45d
Merge branch '963_oob_oauth_redirect_fix' into 'develop'
...
[#963 ] No redirect on OOB OAuth authorize request with existing authorization
See merge request pleroma/pleroma!1276
2019-06-15 13:45:50 +00:00
9b908697dd
OEmbed.OEmbedController does not exist in the Pleroma codebase. It was removed in commit 92c5640f
...
and this leftover artifact breaks compiling now.
2019-06-15 07:04:01 -05:00
a440cf856d
Mastodon API: Return the token needed for the chat.
2019-06-15 10:59:35 +02:00
62ffc00a5d
Merge branch 'feature/add-background-image-to-mastoapi' into 'develop'
...
AccountView: Add user background.
See merge request pleroma/pleroma!1280
2019-06-14 16:49:28 +00:00
c2ca1f22a2
it is changed in compile time
...
we can't change module attributes and endpoint settings in runtime
2019-06-14 15:45:05 +00:00
7f48b90bfb
Merge branch 'fix/hashtag-rich-media' into 'develop'
...
Fix hashtags being picked up by rich media parser
Closes #989
See merge request pleroma/pleroma!1288
2019-06-14 11:52:04 +00:00
ee4ed87fb4
[ #948 ] /api/v1/account_search added optional parameters (limit, offset, following)
2019-06-14 11:39:57 +00:00
d0ebc0edf3
Fix hashtags being picked up by rich media parser
...
Closes #989
2019-06-14 14:34:42 +03:00
58a094b605
Add copyright info to containment.ex
2019-06-14 09:26:36 +00:00
eac298083f
MastodonAPI: Add a way to update the background image.
2019-06-14 11:19:22 +02:00
b22b10d3aa
Improve rate limiter documentation
...
Documents how to disable rate limiting
2019-06-14 15:02:10 +07:00
315f090f59
Prometheus: Remove flaky process collection NIF.
2019-06-13 20:30:04 +02:00
5965efb216
AccountView: Add user background.
2019-06-13 19:08:05 +02:00
6f5a0cc14e
Merge branch 'fix/ogp-title' into 'develop'
...
Rich Media Parser: Attempt to use <title> from HTML as a fallback
Closes #979
See merge request pleroma/pleroma!1277
2019-06-13 13:26:39 +00:00
30e54fd7e2
Handle HTTP 404 response
2019-06-13 17:13:35 +07:00
afae3ada22
Handle HTTP "410 Gone" response
2019-06-13 16:34:03 +07:00
a12f8e13c8
Improve <title> fallback; Add a test
2019-06-13 15:02:46 +07:00
7363a0ea8a
Revert "Only run Floki if title is missing from the map"
...
This reverts commit 97d2b1a45a
2019-06-12 18:32:28 -05:00
97d2b1a45a
Only run Floki if title is missing from the map
2019-06-12 18:27:35 -05:00
097fdf6a5d
Attempt to use <title> from HTML as a fallback
2019-06-12 17:56:51 -05:00
4b2c29016c
[ #963 ] No redirect on OOB OAuth authorize request with existing authorization. OAuth-related refactoring.
2019-06-12 21:30:06 +03:00
966543379d
MastodonAPI Controller: Band-Aid double vote problem.
2019-06-12 16:36:23 +02:00
f46c628e6b
Merge branch 'update_auto_linker' into 'develop'
...
Update `auto_linker` dependency
See merge request pleroma/pleroma!1272
2019-06-12 09:52:29 +00:00
817c66bc3e
Remove search result order for non-RUM indexes
2019-06-12 16:22:56 +07:00
bf22ed5fbd
Update `auto_linker` dependency
2019-06-12 15:53:33 +07:00
6f29865d43
Add option to restrict all users to local content
2019-06-11 21:25:53 +07:00
63ab3c30eb
Merge branch 'feature/rate-limiter' into 'develop'
...
Feature/Rate Limiter
Closes #943
See merge request pleroma/pleroma!1266
2019-06-11 11:32:01 +00:00
ad04d12de6
Replace `MastodonAPIController.account_register/2` rate limiter
2019-06-11 16:06:03 +07:00
bc8f059367
Add rate limiting for search endpoints
2019-06-11 14:28:39 +07:00
2e5affce61
Add RateLimiter
2019-06-11 14:27:41 +07:00
f2d72b1fe4
Merge branch 'preload-changes' into 'develop'
...
Conversations: Fetch users in one query.
See merge request pleroma/pleroma!1258
2019-06-11 02:37:08 +00:00
3ecfe2a6d4
Merge branch 'develop' into feature/releases
2019-06-09 13:55:32 +03:00
2a659b35f1
Add migrate/rollback to release tasks
2019-06-09 13:33:44 +03:00
7223c1b643
Use Mix.shell().yes? if available
2019-06-08 20:10:48 +03:00
d7ec0898e5
Make mix tasks work in a release
2019-06-08 17:40:40 +03:00
1e0fa899b6
Merge branch 'fix/transmogrifier-inReplyTo' into 'develop'
...
Transmogrifier: Do not crash if inReplyTo does not exist and can't be fetched
See merge request pleroma/pleroma!1259
2019-06-08 10:22:15 +00:00
d020f68e87
Transmogrifier: Do not crash if inReplyTo does not exist and can't be fetched
2019-06-07 20:40:38 +03:00
970f71e222
Conversations: Fetch users in one query.
2019-06-07 17:51:47 +02:00
cb3258c863
Emoji: Use full path to check if a file is a directory.
2019-06-07 17:31:21 +02:00
d5330ed125
Merge branch 'fix/replace-mix-env' into 'develop'
...
Replace Mix.env with Pleroma.Config.get(:env)
See merge request pleroma/pleroma!1254
2019-06-07 10:58:09 +00:00
bc597d888c
Mix Tasks: Switch to Application.ensure_all_started instead of
...
Mix.Task.run and ensure serve_endpoints is set to false
In release environments there is no Mix.Task.run and serve_endpoints
must be set to true for the endpoints to start, so we need to ensure it
is set to false before starting Pleroma for executing a mix task.
2019-06-07 12:37:20 +03:00
01fe5abad1
Resolve conflicts
2019-06-07 01:20:50 +03:00
92213fb87c
Replace Mix.env with Pleroma.Config.get(:env)
...
Mix.env/0 is not availible in release environments such as distillery or
elixir's built-in releases.
2019-06-06 23:59:51 +03:00
62cdf701f4
Merge branch 'fix/elixir-master-deprecation-warnings' into 'develop'
...
Switch to manual Supervisor child specifications instead of Supervisor.Spec
See merge request pleroma/pleroma!1252
2019-06-06 14:54:29 +00:00
cb2bcee842
User Search: Boost friends more strongly.
2019-06-06 16:18:27 +02:00
9ae8f012a5
Switch to manual Supervisor child specifications instead of Supervisor.Spec
...
Supervisor.Spec is deprecated and causes warnings on Elixir master, see
https://hexdocs.pm/elixir/Supervisor.Spec.html
2019-06-06 16:37:44 +03:00
f82382de22
[ #943 ] Make the unauthenticated users limitation optional
2019-06-06 12:17:49 +00:00
3f6da9c45a
Merge branch 'bugfix/377-stuck-follow-request' into 'develop'
...
Bugfix/377 stuck follow request
Closes #377
See merge request pleroma/pleroma!1250
2019-06-05 15:52:40 +00:00
a511d2f900
Merge branch 'improve-search' into 'develop'
...
[#943 ] Contain search for unauthenticated users
See merge request pleroma/pleroma!1220
2019-06-05 15:51:32 +00:00
e1370ba131
Utils: Use update_follow_state_for_all when appropriate.
2019-06-05 16:51:28 +02:00
ad19bfc7fe
Utils: Split update_follow_state and update_follow_state_for_all.
2019-06-05 16:43:35 +02:00
076c9ae40e
User: Remove superfluous `maybe_follow`.
2019-06-05 14:24:31 +02:00
3115b64cfe
Transmogrifier: Add tests for incoming follows to locked accounts.
2019-06-05 14:10:46 +02:00
50afe5ab9e
Merge branch 'fix-stuck-follows' into 'develop'
...
User: Don't error out when following a user that's already followed.
See merge request pleroma/pleroma!1249
2019-06-05 11:07:54 +00:00
ddd4a09b72
Fix merge conflict
2019-06-05 17:55:00 +07:00
cfa5572d28
Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists
2019-06-05 17:53:15 +07:00
024dfdc39c
Typo + Linting.
2019-06-05 12:45:28 +02:00
8b9a0dd4a7
User: Don't error out when following a user that's already followed.
...
This leads to a few situations where it is impossible to follow a user.
2019-06-05 12:06:45 +02:00
3eefb274f4
OAuth consumer: tests fix, comments, Keycloak config notes.
2019-06-05 13:02:13 +03:00
1cb245c982
Fix formatting
2019-06-05 16:55:17 +07:00
5b04f07a1e
Limit search for unauthenticated users to local users only
2019-06-05 16:51:04 +07:00
94b9e9d844
Update benchmark mix task
2019-06-05 16:37:43 +07:00
93397fce3d
Contain search for unauthenticated users
2019-06-05 16:37:43 +07:00
e4babb1c9f
Merge branch 'explicit-addressing' into 'develop'
...
Explicit addressing
See merge request pleroma/pleroma!1239
2019-06-05 08:28:20 +00:00
6ba9055b51
Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists
2019-06-05 12:54:30 +07:00
b1b1a270e8
Fix conflict
2019-06-05 02:45:21 +03:00
ab4915edcb
Merge branch 'bugfix/956-activity-id-nil-conversations' into 'develop'
...
Participations: Filter out participations without activities.
Closes #956 and #953
See merge request pleroma/pleroma!1246
2019-06-04 15:34:55 +00:00
18c35d84fd
NodeInfo: Add explicit addressing to nodeinfo.
2019-06-04 17:14:25 +02:00
1e7bb69a95
update ActivityPub#fetch_activities_query
2019-06-04 15:21:18 +03:00
d3d1704e84
Merge branch 'develop' into issue/941
2019-06-04 15:06:58 +03:00
0acfcf6c52
update ActivityPub#fetch_activities_query
2019-06-04 15:04:36 +03:00
a3a7178b60
Participations: Filter out participations without activities.
2019-06-04 13:58:36 +02:00
0eb7464c10
Merge branch 'emoji-loader-fix' into 'develop'
...
Emoji: Don't die when files are present in the emoji folder.
Closes #957
See merge request pleroma/pleroma!1245
2019-06-04 11:26:42 +00:00
17383861ed
Fix CommonAPI.vote returning tuples inside of the activity array instead of just activities
2019-06-04 13:38:32 +03:00
e74581a5c4
Emoji: Don't die when files are present in the emoji folder.
2019-06-04 12:14:43 +02:00
29b022bb59
Restrict `get_existing_votes` to only get Create activities
2019-06-04 12:42:10 +03:00
9ce928d823
Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists
2019-06-04 16:28:23 +07:00
4cab98b7bf
Merge remote-tracking branch 'origin/develop' into explicit-addressing
2019-06-04 11:23:46 +02:00
37a4ba0624
utils: access inReplyTo as an explicit string when fetching poll results`
2019-06-04 08:45:03 +00:00
4f2e359687
Merge branch 'develop' into issue/941
2019-06-04 09:49:08 +03:00
1c6cf0a348
nodeinfo: add pollLimits to metadata
2019-06-04 06:19:44 +00:00
9f0d0d0805
Merge branch 'feature/mrf-subchain' into 'develop'
...
MRF: subchain policy
See merge request pleroma/pleroma!1233
2019-06-04 05:49:54 +00:00
9d2563a3de
Merge branch 'generic-fe-settings' into 'develop'
...
Generic settings store for frontend user settings
See merge request pleroma/pleroma!1221
2019-06-04 05:43:43 +00:00
3e17610587
Add task to test emails
2019-06-04 02:48:21 +03:00
6ef145b4fc
Merge branch 'develop' into feature/digest-email
2019-06-03 15:29:53 -05:00
f13d6c7f78
update api to set skip_thread_containment
2019-06-03 21:02:57 +03:00
f2c4c99e03
Remove repeated scope lists
2019-06-03 19:18:21 +03:00
80d4d83aac
CommonAPI: Add explicit addressing.
2019-06-03 18:17:08 +02:00
2b664b048e
User: Add function to get AP ids from nicknames.
2019-06-03 18:16:11 +02:00
243d8ed94e
Use workaround for the heavy checkmark symbol in iOS
2019-06-03 18:28:36 +03:00
f4e2595592
Merge branch 'develop' into update-oauth-template
2019-06-03 09:12:17 -05:00
080e1aa70e
add option skip_thread_containment
2019-06-03 16:13:37 +03:00
dc91bcc0af
Merge branch 'develop' into feature/polls-2-electric-boogalo
2019-06-03 13:16:17 +03:00
314758c25b
Merge branch 'align-mastodon-conversations' into 'develop'
...
Mastodon Conversations API: Align to Mastodon behavior
See merge request pleroma/pleroma!1215
2019-06-03 09:48:37 +00:00
026b245dbc
Merge branch 'develop' into feature/polls-2-electric-boogalo
2019-06-03 11:14:52 +03:00
5bd41fef8b
Change query order in fetch_activities_for_context_query to make poll vote exclusion work
2019-06-03 10:58:37 +03:00
1fd8e19d76
Remove a TODO comment as the tests for poll view were written
2019-06-02 23:46:17 +03:00
2fe3a20638
Make error message about author's inability to vote more sensible
2019-06-02 23:33:15 +03:00
e3c460353d
Refresh the object in CommonAPI.vote instead of MastoAPI controller
2019-06-02 23:24:48 +03:00
561a21986d
formatting
2019-06-02 10:29:15 +00:00
4087ccdab8
mrf: add subchain policy
2019-06-02 10:07:42 +00:00
edf772d41e
mrf: allow a policy chain to be specified when filtering
2019-06-02 09:44:42 +00:00
52e09807d4
reverse proxy: clean up some @hackney leftovers
2019-06-02 09:09:58 +00:00
5402d04e3c
Merge branch 'feature/notification-control-part-2' into 'develop'
...
notification controls, part 2
See merge request pleroma/pleroma!1204
2019-06-02 08:25:37 +00:00
6bc9e5c020
Mastodon API: Refresh the object before rendering it after voting
2019-06-01 21:41:49 +03:00
444406167b
Mastodon API: actually check for poll votes
2019-06-01 21:41:23 +03:00
65db5e9f52
Resolve merge conflicts
2019-06-01 16:29:58 +03:00
300d94c628
Add poll votes
...
Also in this commit by accident:
- Fix query ordering causing exclude_poll_votes to not work
- Do not create notifications for Answer objects
2019-06-01 16:17:46 +03:00
ad5263c647
Merge remote-tracking branch 'upstream/develop' into admin-create-users
2019-06-01 11:42:37 +05:45
5534d4c676
make bulk user creation from admin works as a transaction
2019-06-01 11:17:53 +05:45
e706b42f51
Merge branch 'bugfix/visibility-indicator-litepub-dm' into 'develop'
...
visibility: if litepub:directMessage is asserted, always report the object as "direct" visibility
See merge request pleroma/pleroma!1230
2019-06-01 03:39:13 +00:00
2bbc2a801f
Remove all follower collections but actor's from "cc"
2019-06-01 03:26:45 +00:00
f2efe24cf8
visibility: if litepub:directMessage is asserted, always report the object as "direct" visibility
2019-06-01 03:24:08 +00:00
5d3ece2861
Remove now useless flavours switching
2019-06-01 01:44:10 +02:00
aa9f52edd2
mastodon_api_controller.ex: Remove vanilla from supported_flavours
2019-06-01 01:44:10 +02:00
6872c5f88f
Mastodon API search default value for "resolve" is false
...
https://docs.joinmastodon.org/api/rest/accounts/
https://docs.joinmastodon.org/api/rest/search/
2019-05-31 18:46:57 +00:00
2993361075
Merge branch 'hotfix/leaking-lists' into 'develop'
...
Mastodon API: Fix lists leaking private posts
See merge request pleroma/pleroma!1222
2019-05-31 13:26:48 +00:00
7861974ab2
MastodonAPI: Add extension to set and get pleroma_settings_store.
2019-05-31 14:50:18 +02:00
aaad85c4d9
AccountView: settings -> settings_store
2019-05-31 14:49:46 +02:00
eb2963bc43
User: Add settings store to Info, AccountView
...
This is to provide a generic frontend settings storage mechanism for all kinds
of frontends.
2019-05-31 14:27:15 +02:00
d9c0650ff9
Mastodon API: Fix lists leaking private posts
...
Our previous list visibility resolver grabbed posts if either follower
collection of the user in a list who is followed is in `to` or if
follower collection of the user in a list was in `cc`. This not only
missed unlisted posts but also lead to leaking private posts when
`fix_explicit_addressing` mistakingly started putting follower collections
to `cc` (also fixed in this MR).
Reported by @kurisu@iscute.moe via a DM
2019-05-31 15:25:17 +03:00
a9eaa55885
Fix fix_explicit_addressing moving follower collection to cc and add tests for it
2019-05-31 14:17:05 +03:00
97fb50d9fa
Mastodon Conversation API: Don't return own account in 'accounts'.
2019-05-31 11:27:14 +02:00
1690be991e
Replace missing non-nullable Card attributes with empty strings
2019-05-30 21:03:31 +00:00
91ac8b075b
Merge branch 'use-pleroma-config' into 'develop'
...
Use Pleroma.Config everywhere
See merge request pleroma/pleroma!1214
2019-05-30 13:16:08 +00:00
99f70c7e20
Use Pleroma.Config everywhere
2019-05-30 15:33:58 +07:00
6aec0d1b58
Revert "Merge branch 'feature/search-authenticated-only' into 'develop'"
...
This reverts merge request !1209
2019-05-29 22:10:16 +00:00
5cee2fe9fe
Replace Application.get_env/2 with Pleroma.Config.get/1
2019-05-29 21:31:27 +03:00
e7edfd9fec
Permit fetching statuses from API with nickname or id
2019-05-29 12:20:18 -05:00
ce47017c89
Merge develop
2019-05-29 18:18:22 +03:00
672fddb721
Default search limit should be 40
...
https://docs.joinmastodon.org/api/rest/search/
2019-05-29 08:06:26 -05:00
0159a6dbe9
router: require oauth_read for searching
...
Search calls are generally expensive and allow unauthenticated users to
crawl the instance for user profiles or posts which contain specified
keywords. An adversary can build a distributed search engine which not
only will consume significant instance resources, but also can be used
for undesirable purposes such as datamining.
Accordingly, require authenticated access to use the search API endpoints.
This acts as a nice balance as it allows guest users to make use of most
functionality available in Pleroma FE while ensuring that Pleroma
instances are reasonably protected from resource exhaustion. It also
removes Pleroma as a potential vector in distributed search engines.
2019-05-29 10:58:45 +00:00
9f3bcf0efe
Respect proxy settings federation
2019-05-28 06:49:53 +00:00
1452a96ad6
ability to set and reset avatar, profile banner and backgroud in Mastodon API
2019-05-27 15:31:01 +05:45
5bb843ceec
Merge branch 'refactor/die-httpoison-die' into 'develop'
...
remove @httpoison, @ostatus and @websub compile-time constants
See merge request pleroma/pleroma!1203
2019-05-26 13:33:11 +00:00
79503ce90f
mrf: simple policy: fix matching imported activitypub and ostatus statuses
2019-05-26 02:01:24 +00:00
750ede5764
notification: remove local/remote match rules (too complicated)
2019-05-26 00:05:47 +00:00
e7e2e7a1a6
user info: allow formdata for notification settings like every other API
2019-05-25 05:54:02 +00:00
59a703fcbe
twitter api: user view: expose user notification settings under pleroma object
2019-05-25 05:31:13 +00:00
4030837d91
notification: add non_follows/non_followers notification control settings
2019-05-25 05:19:47 +00:00
56fd7dbdd7
remove @websub and @ostatus module-level constants
2019-05-25 04:43:11 +00:00
9bec891eb4
kill @httpoison
2019-05-25 04:24:21 +00:00
9415932af5
Keep nodeinfo available when not federating
2019-05-25 08:15:12 +08:00
bbea5691da
Mention all people in the beginning of DM
2019-05-24 20:34:23 +00:00
f916e4cdd9
Move the Cache Control header test to its own file
...
We can consolidate our cache control header tests here
2019-05-24 20:33:55 +00:00
f333041a0a
Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists
2019-05-24 21:05:57 +07:00
8b2d39c1ec
Change the order of preloading when fetching activities for context
2019-05-23 14:03:16 +03:00
0c53d91f3b
fix merge conflict
2019-05-23 09:45:12 +02:00
e6b175ed6c
Fix credo issues
2019-05-22 21:57:46 +03:00
baf72d6c58
mrf: simple policy: add the ability to strip avatars and banners from user profiles
2019-05-22 18:53:12 +00:00
60f882b09f
activitypub: run user objects through MRF filters
2019-05-22 18:53:12 +00:00
75b6c4b004
mrf: defang policy modules for filtering user profile objects
2019-05-22 18:53:12 +00:00
ac7702f800
Exclude Answers from fetching by default
2019-05-22 21:52:12 +03:00
19c90d47c4
Normalize poll votes to Answer objects
2019-05-22 21:17:57 +03:00
54e10a3e55
Disable timeouts for object pruning query
2019-05-22 20:10:52 +03:00
620908a2db
[ #699 ] add worker to clean expired oauth tokens
2019-05-22 15:44:50 +00:00
714d8d4ef9
Merge branch 'feature/object-pruning' into 'develop'
...
Object pruning
See merge request pleroma/pleroma!1181
2019-05-22 11:04:30 +00:00
ff363f70b5
Merge branch 'refactor/keys' into 'develop'
...
move key generation functions into Pleroma.Keys module
See merge request pleroma/pleroma!1186
2019-05-22 06:28:16 +00:00
1344c85e2f
salmon: fix credo
2019-05-22 05:58:51 +00:00
cdac5efd10
Merge branch 'bugfix/account_view_source.note' into 'develop'
...
MastoAPI AccountView: fill source.note with plaintext version of note
Closes #926
See merge request pleroma/pleroma!1189
2019-05-22 05:39:01 +00:00
0e2c215a00
MastoAPI AccountView: fill source.note with plaintext version of note
...
Closes: https://git.pleroma.social/pleroma/pleroma/issues/926
2019-05-22 07:22:19 +02:00
17bfd000d7
Ability to reset avatar, profile banner and backgroud
2019-05-22 06:47:18 +02:00
79c2cef2fb
Merge branch 'mongooseim-support' into 'develop'
...
MongooseIM: Add basic integration endpoints.
See merge request pleroma/pleroma!1172
2019-05-22 04:06:54 +00:00
ab6e15622b
Merge branch 'fix/api-fallback' into 'develop'
...
Do not fallback to index.html for /api/* routes
Closes #920
See merge request pleroma/pleroma!1182
2019-05-22 04:05:41 +00:00
9134848170
Do not truncate DM when it contains newlines and safe_dm_mentions is set to true
2019-05-22 04:04:20 +00:00
045803346d
move key generation functions into Pleroma.Keys module
2019-05-22 03:58:15 +00:00
a023ca004c
prune objects task: use Repo.delete_all()
2019-05-22 03:12:48 +00:00
3ab9255eda
Respond with a 404 Not implemented JSON error message
...
when requested API is not implemented
2019-05-22 07:15:52 +08:00
16b260fb19
add mix task to prune the object database using a configured retention period
2019-05-21 21:38:56 +00:00
73df9d690d
object: fetcher: add support for reinjecting pruned objects
2019-05-21 21:38:56 +00:00
c2b0b82e6a
object: add Object.prune()
2019-05-21 21:38:56 +00:00
63b0b7190c
MastoAPI: Add GET /api/v1/polls/:id
2019-05-21 20:40:35 +03:00
ff61d34502
Accept question objects for conversations
2019-05-21 17:33:54 +03:00
5f67c26baf
Accept strings in expires_in because sasuga javascript
2019-05-21 17:30:51 +03:00
0407ffe75f
Change validation error status codes to be more appropriate
2019-05-21 17:12:38 +03:00
ee68244141
Do not stream out poll replies
2019-05-21 16:58:15 +03:00
d7c4d029c8
Restrict poll replies when fetching activiites for context
2019-05-21 14:35:20 +03:00
f28747858b
Actual vote count in poll view
2019-05-21 14:27:09 +03:00
a53d062730
Fix posting non-polls from mastofe
2019-05-21 14:19:03 +03:00
aafe30d94e
Handle poll votes
2019-05-21 14:12:10 +03:00
3f96b3e4b8
Enforce poll limits and add error handling for MastodonAPI's post endpoint
2019-05-21 10:54:20 +03:00
76a7429bef
Add poll limits to /api/v1/instance and initial state
2019-05-21 09:13:10 +03:00
be6b57193a
Merge branch 'trivial/increase-hackney-timeouts' into 'develop'
...
http: bump connection timeout to 10 seconds
See merge request pleroma/pleroma!1183
2019-05-21 05:15:29 +00:00
c972d0bb14
http: bump connection timeout to 10 seconds
2019-05-21 04:59:15 +00:00
94caca924d
Merge branch 'fix/prometheus-ecto-error-when-not-configured' into 'develop'
...
Fix prometheus-ecto error when not configured
Closes #917
See merge request pleroma/pleroma!1180
2019-05-21 01:36:06 +00:00
d4847b17ca
Merge branch 'refactor/add-virtual-thread-muted-field' into 'develop'
...
Add virtual :thread_muted? field
Closes #901
See merge request pleroma/pleroma!1178
2019-05-20 23:30:19 +00:00
f96e9b28bb
Fix prometheus-ecto error when not configured
2019-05-21 07:30:18 +08:00
eb02edcad9
Add virtual :thread_muted? field
...
that may be set when fetching activities
2019-05-21 00:35:46 +08:00
daeae8e2e7
Move default mascot configuration to `config/`
2019-05-20 16:12:55 +01:00
3d0d9e7a56
Use string map for default mascot
2019-05-20 13:10:04 +01:00
e81f0fc6d4
Add mascot get/set tests
2019-05-20 12:58:06 +01:00
54e9cb5c2d
Add API endpoints for a custom user mascot
2019-05-20 12:39:23 +01:00
2375e9a95b
Add report filtering to MRF.SimplePolicy
2019-05-20 06:02:50 +08:00
6430cb1bf7
Restrict poll replies from fetch queries by default
2019-05-19 17:44:18 +03:00
1d90f9b969
Remove tags/mentions/rich text from poll options because Mastodon and
...
add custom emoji
2019-05-19 17:06:44 +03:00
5ece901af3
Resolve merge conflicts and remove IO.inspects
2019-05-18 13:37:38 +03:00
fd920c8973
Mastodon API: Add support for posting polls
2019-05-18 13:29:28 +03:00
8e9a764dfc
Merge branch 'feature/mrf-always-nsfw' into 'develop'
...
suppress link previews from posts marked sensitive
Closes #865
See merge request pleroma/pleroma!1173
2019-05-18 07:13:18 +00:00
c4a55e167a
add Changelog entry
2019-05-17 23:00:14 +00:00
dc08159538
also suppress link previews from posts marked #nsfw
2019-05-17 22:13:24 +00:00
290f5b2cfe
config: make sending the user agent configurable, disable sending the user agent in tests
2019-05-17 20:28:58 +00:00
d3b8cd342f
http: request builder: send user-agent when making requests
2019-05-17 19:04:17 +00:00
0da1233e8e
rich media: suppress link previews if post is marked as sensitive
2019-05-17 18:49:43 +00:00
78588dbd80
mrf: simple policy: mark all posts instead of posts with media as sensitive if they match media_nsfw
2019-05-17 18:49:10 +00:00
3b71612d3d
Improve Pleroma.Web.ActivityPub.ActivityPub.maybe_update_cc/3
2019-05-18 01:17:14 +07:00
075eecec90
Linting.
2019-05-17 18:32:30 +02:00
f959bf7aa6
MongooseIM: Add basic integration endpoints.
2019-05-17 18:21:11 +02:00
557f0e33a7
Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists
2019-05-17 19:57:14 +07:00
f2936e0a07
Add `ap_id` to List
2019-05-17 19:56:37 +07:00
412a3d8a0f
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into rum-index
2019-05-17 12:26:59 +02:00
e5b34f5e05
Merge branch 'ecto_sql_update' into 'develop'
...
Dependencies: Update Ecto SQL.
See merge request pleroma/pleroma!1160
2019-05-17 10:21:38 +00:00
1dcdcd8871
Merge branch 'bugfix/903-mastoapi-relationship-requested' into 'develop'
...
MastoAPI account_view.ex: requested is false when following is true
Closes #903
See merge request pleroma/pleroma!1169
2019-05-17 10:07:51 +00:00
46684db84d
Update account_view.ex
2019-05-17 09:53:44 +00:00
249b31ffe5
Fix specs.
2019-05-17 11:49:13 +02:00
642a67dd44
Render polls in statuses
2019-05-17 11:44:47 +03:00
7ed682213f
Fix/902 random compile failing
2019-05-17 07:25:20 +00:00
5c028b8f92
user creation admin api will create multiple users
2019-05-17 12:21:58 +05:45
68c75a08e8
MastoAPI account_view.ex: requested is false when following is true
...
Closes: https://git.pleroma.social/pleroma/pleroma/issues/903
2019-05-17 07:44:09 +02:00
70235ce840
Fix typo: s/"tags"/"tag"/g
2019-05-17 09:02:34 +08:00
bf84d50c76
Merge branch 'feature/890-add-report-uri' into 'develop'
...
Feature/890 add report uri
Closes #890
See merge request pleroma/pleroma!1164
2019-05-16 20:11:12 +00:00
2c303afc8b
Remove duplicated entries in users' following lists
2019-05-16 20:04:08 +00:00
e2b3a27204
Add Reports to Admin API
2019-05-16 19:09:18 +00:00
e190b3022b
Merge branch 'fix/domain-unblocked-reblogs' into 'develop'
...
Fix domain-unblocked reblogs
Closes #892
See merge request pleroma/pleroma!1157
2019-05-16 18:57:14 +00:00
efa61c1610
Move to pleroma.database mix task
2019-05-16 13:14:48 -05:00
ebb0482116
Merge branch 'develop' into conversations-import
2019-05-16 13:11:17 -05:00
fde30aee43
Merge branch 'feature/sql-thread-sat' into 'develop'
...
SQL thread visibility solver
See merge request pleroma/pleroma!971
2019-05-16 13:44:22 +00:00
73ae58fdfa
Feature/896 toggling confirmation
2019-05-16 13:23:41 +00:00
fc7246d715
Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists
2019-05-16 17:54:24 +07:00
9d14214eb9
Merge branch 'develop' into feature/890-add-report-uri
2019-05-16 12:54:06 +07:00
aa11fa4864
add report uri and report to
2019-05-16 12:49:40 +07:00
c31026423c
publisher: use the correct queue name for outgoing federation
2019-05-16 04:41:27 +00:00
793f1834d2
Use named binding to conditionally join object
2019-05-16 06:25:14 +08:00
2b6119dfbf
Restrict reblogs of activities from blocked domains
2019-05-16 05:53:51 +08:00
62e42b03ab
Handle incoming Question objects
2019-05-15 20:10:16 +03:00
a591ab6112
activity pub: remove Ecto SQL query dumps
2019-05-15 16:56:46 +00:00
f09c3afdf5
chase test failures
2019-05-15 16:23:01 +00:00
0aada88b55
bbs: chase timeline containment patch
2019-05-15 16:02:15 +00:00
31db31c587
activitypub: visibility: use SQL thread_visibility() function instead of manually walking the thread
2019-05-15 15:54:10 +00:00
de114ffbb0
activitypub: remove contain_timeline()
2019-05-15 15:53:06 +00:00
0387f52138
activitypub: add restrict_thread_visibility()
2019-05-15 15:53:06 +00:00
f168a1cbdc
Merge remote-tracking branch 'origin/develop' into conversations-import
2019-05-15 17:47:29 +02:00
62516be9c4
Merge branch 'fix/public-option-not-working' into 'develop'
...
Fix public option not working
Closes #873
See merge request pleroma/pleroma!1143
2019-05-15 15:42:21 +00:00
4440e23547
Merge branch 'chore/extricate-http-signatures' into 'develop'
...
switch to pleroma/http_signatures library
See merge request pleroma/pleroma!1155
2019-05-15 15:37:31 +00:00
7a92e701b9
CommonAPI: Visibility refactor.
2019-05-15 16:35:33 +02:00
cbb3451023
CommonAPI: Refactor visibility, forbid public to private replies.
2019-05-15 16:30:08 +02:00
f1e67bdc31
Search: Add optional rum indexing / searching.
2019-05-15 15:28:01 +02:00
ee22fff5ac
remove deprecated PleromaFE configuration
2019-05-15 15:29:59 +05:45
a7a8f3bc2c
Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists
2019-05-15 14:31:24 +07:00
70c81b95d0
Pipe requests to public endpoints through EnsurePublicOrAuthenticatedPlug
2019-05-15 05:09:32 +08:00
7b8dc99ef1
Implement Pleroma.Plugs.EnsurePublicOrAuthenticated
2019-05-15 05:09:29 +08:00
071f78733a
switch to pleroma/http_signatures library
2019-05-14 20:03:13 +00:00
1caa6331ea
Group def perform() together to fix the build
2019-05-14 12:33:03 -05:00
fa4bd898f1
Merge branch 'fix/gopher' into 'develop'
...
gopher: fix rendering of post content (closes #895 )
Closes #895
See merge request pleroma/pleroma!1150
2019-05-14 15:41:37 +00:00
51325fd60c
gopher: fix rendering of post content ( closes #895 )
2019-05-14 15:35:06 +00:00
692919c7d2
Merge branch 'refactor/use-job-queue-everywhere' into 'develop'
...
use job queue everywhere
Closes #862
See merge request pleroma/pleroma!1142
2019-05-14 15:27:34 +00:00
ac3a3abf6b
clean up follow/block imports a little
2019-05-14 15:07:38 +00:00
dfd031c26a
Merge branch 'fix/pleroma-config-get-when-value-is-false' into 'develop'
...
Fix Pleroma.Config.get!/1 raising an error when value is false
See merge request pleroma/pleroma!1148
2019-05-14 14:58:45 +00:00
52297920e7
Refactoring oauth response.
2019-05-14 14:49:45 +00:00
e82e73478e
Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists
2019-05-14 19:00:07 +07:00
b92c004ea8
Reuse query from User.restrict_deactivated/1
2019-05-14 18:29:10 +07:00
5e2b491276
Merge remote-tracking branch 'pleroma/develop' into feature/disable-account
2019-05-14 18:15:56 +07:00
a18b2c0b12
Fix Pleroma.Config.get!/1 raising an error when value is false
2019-05-14 06:40:59 +08:00
bbacdf2352
Bump Mastodon API level
2019-05-13 15:52:16 -05:00
498bfdf403
Switch to Jason over Poison
2019-05-13 15:37:38 -05:00
69a9e0563c
user: migrate follow/blocks import to job queue
2019-05-13 19:36:00 +00:00
57d11ac9db
activitypub: move post rich media fetching to job queue
2019-05-13 19:36:00 +00:00
32d4630c9c
user: move initial post fetching to job queue
2019-05-13 19:36:00 +00:00
b14a314ce7
Merge branch 'feature/federator-behaviours' into 'develop'
...
federator modularization (outgoing)
See merge request pleroma/pleroma!1140
2019-05-13 18:58:04 +00:00
a2be420f94
differences_in_mastoapi_responses.md: fullname & bio are optionnal
...
[ci skip]
2019-05-13 18:35:45 +00:00
7701a4c841
Make irreversible field default to false in filters
2019-05-14 00:13:15 +05:45
786f2c7a84
Update shortdoc description
2019-05-13 11:16:54 -05:00
23276e8d68
Use pseudo ap id of a list in BCC
2019-05-13 16:15:14 +07:00
44b182732e
nodeinfo: gather supported protocol names from federation modules
2019-05-12 19:15:29 +00:00
28f7f4c6de
webfinger: build the response based on enabled federation modules
2019-05-12 19:05:03 +00:00
80759f012e
xml builder: properly escape quotes
2019-05-12 19:04:37 +00:00
55fa4b812a
federator: websub removal
2019-05-12 05:04:24 +00:00
c23276a59a
activitypub: publisher: fixups
2019-05-12 05:04:24 +00:00
fedaca15a3
websub: adapt to work as a federator publishing module
2019-05-12 05:04:24 +00:00
179293e51c
salmon: refactor to work as a federator publishing module
2019-05-12 05:04:21 +00:00
2aee62a456
federator: publisher: only attempt publishing if we know the activity is representable
2019-05-12 05:04:16 +00:00
69158f1065
ostatus: only as:Public activities are representable
2019-05-12 05:04:16 +00:00
85377c0b67
federator: move activitypub relaying to the AP publisher module
2019-05-12 05:04:16 +00:00
676752bb83
federator: hook up Publisher.publish()
2019-05-12 05:04:16 +00:00
f7a6a37c4e
federator: remove no longer used :publish_single_ap
2019-05-12 05:04:16 +00:00
10695a28d2
federator: publisher: add publish() wrapper
2019-05-12 05:04:16 +00:00
0afc8d7856
federator: publisher: integrate job queue, simplify publish_one logic
2019-05-12 05:04:16 +00:00
ef1f9e8d4e
activitypub: split out outgoing federation into a federation module
2019-05-12 05:04:11 +00:00
e7d292f80e
federator: add publisher module defining a contract for publishing behaviours
2019-05-12 03:08:50 +00:00
b9f84a382a
Normalize the object only after ensuring the activity type is Create
2019-05-12 03:01:42 +03:00
131f883207
Merge branch 'fix/ostatus-activity-representer-depends-on-emebeded-objects' into 'develop'
...
Fix get_in_reply_to in OStatus' activity representer depending on embedded objects
See merge request pleroma/pleroma!1129
2019-05-11 16:52:26 +00:00
01c45ddc9e
Search: Use RUM index.
2019-05-11 11:26:46 +02:00
f01f995816
make url uniform in admin api
2019-05-11 14:46:00 +05:45
f1f7a11222
Merge develop
2019-05-11 14:45:54 +07:00
c953ae8c3d
Initial bundle of basic AdminFE
...
Due to CSP headers we only allow connecting to self. If you want to
host AdminFE on a separate domain without CSP headers you will be able
to connect to any public Pleroma host.
2019-05-11 01:34:17 +00:00
1d78e42fd4
Remove get_in_reply_to calls in some functions because the result is unused and it does not have any side-effects
2019-05-10 13:49:34 +03:00
2a54e8c1f5
Use "repeated" instead of "retweeted" for repeated statuses in Twitter API
...
This makes it consistent with the language used in Pleroma FE (at least
in English).
Resolves https://git.pleroma.social/pleroma/pleroma-fe/issues/533
2019-05-09 19:58:34 -04:00
e4523c3010
Fix get_in_reply_to in OStatus' activity representer depending on embedded objects
2019-05-09 22:27:00 +03:00
a33bec7d58
Conversations: Import order, import as read.
2019-05-09 16:39:28 +02:00
e6d7f8d223
Credo fixes.
2019-05-08 18:19:20 +02:00
6d19bb4eae
Conversations: Add mix task to 'import' old DMs.
2019-05-08 18:09:07 +02:00
a4598b5e8b
Visibility: Make it more resilient.
2019-05-08 18:08:50 +02:00
920bd47055
ActivityPub: Remove leftover printf debugging.
2019-05-08 17:40:24 +02:00
fcf2f38d20
Conversations: Add a function to 'import' old DMs.
2019-05-08 17:37:00 +02:00
bfeb33e951
Merge develop
...
Merge conflict in lib/pleroma/activity.ex
2019-05-08 14:34:36 +00:00
a76e2622ca
emoji dowload follow redirects
2019-05-08 19:05:25 +07:00
799e1f48b5
Refactoring functions for dealing with oauth scopes.
2019-05-08 10:52:13 +00:00
b6b5b16ba4
Merge develop
2019-05-08 17:08:06 +07:00
14deed7f7d
Merge branch 'refactor/preload-bookmarks-with-activities' into 'develop'
...
Optimize bookmarks by preloading them with activities
Closes #861
See merge request pleroma/pleroma!1121
2019-05-07 19:37:41 +00:00
d64c3b604e
twitterapi: use order constraint to force descending order
2019-05-07 19:33:25 +00:00
6020ff3fb6
activitypub: add optional order constraint to timeline query builder
2019-05-07 19:33:22 +00:00
4c5125dedc
Remove `bookmarks` assoc and add a fake `bookmark` assoc instead
2019-05-07 19:33:22 +00:00
be067ec2ab
Use with_preloaded_bookmark in create_by_object_ap_id_with_object
2019-05-07 19:33:22 +00:00
3a7c14645e
- Actually use preloaded bookmarks in views
...
- Preload bookmarks in bookmark timeline
- Rework bookmark preload tests
2019-05-07 19:33:22 +00:00
f841eb7cdb
Preload bookmarks wherever the object is preloaded
2019-05-07 19:33:22 +00:00
06947c9147
Remove bookmarks assoc
2019-05-07 19:33:22 +00:00
a1a0df19c4
Merge branch 'docs/MRF-modules' into 'develop'
...
Documentation: MRF Modules
See merge request pleroma/pleroma!1122
2019-05-07 16:15:27 +00:00
e71ddf23ba
containment: remove pointless moduledoc line
2019-05-07 16:11:22 +00:00
238dd72fad
Merge branch 'conversations_three' into 'develop'
...
Conversations once more.
See merge request pleroma/pleroma!1119
2019-05-07 14:43:21 +00:00
1557b99beb
Merge remote-tracking branch 'pleroma/develop' into feature/disable-account
2019-05-07 16:51:11 +07:00
1040caf096
fix format
...
Modified-by: Maksim Pechnikov <parallel588@gmail.com>
2019-05-06 17:51:03 +00:00
aacac9da0b
Merge branch 'feature/bbs' into 'develop'
...
BBS / SSH
See merge request pleroma/pleroma!997
2019-05-06 17:17:03 +00:00
ce6ca0fefe
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into feature/845-improve-status-deletion
2019-05-06 16:45:22 +00:00
69a5074893
Remove H1 in @moduledoc
2019-05-06 04:53:12 +02:00
e41a2f98d5
mrf/tag_policy.ex: Add some documentation
...
mrf_tag:disable-remote-subscription exact way of working is quite
unclear to me. Is it the requester that is denied if they have a tag,
or is it the requestee if they have one?
2019-05-06 04:53:11 +02:00
af62ace954
Add short documentation on every MRF Policy
2019-05-06 04:49:50 +02:00
eb0fb73ddb
BBS: Credo fixes.
2019-05-04 15:47:50 +02:00
c9d1cb2dce
BBS: Use cached user fetcher.
2019-05-04 15:08:07 +02:00
4c76f49e60
BBS: small fixes.
2019-05-04 15:06:18 +02:00
6ad8ddfd29
Merge remote-tracking branch 'origin/develop' into feature/bbs
2019-05-04 15:00:45 +02:00
d089ff2460
Merge branch 'fix/embeded-relationship-in-follows' into 'develop'
...
Fix embeded relationships in Mastodon API
See merge request pleroma/pleroma!1118
2019-05-03 20:36:13 +00:00
9907e974ca
Merge branch 'fix-search-speed' into 'develop'
...
Search: Add fts index on objects table.
See merge request pleroma/pleroma!1120
2019-05-03 18:35:02 +00:00
0e37fddd5a
Search: Add fts index on objects table.
2019-05-03 19:21:09 +02:00
b5ad1715b2
MastoAPI: profile update with emoji_map
2019-05-03 16:41:23 +02:00
46bbf9e1cf
TwitterAPI: profile update with emoji_map
2019-05-03 16:30:24 +02:00
85434669bb
Web.TwitterAPI.UserView: Also view local user emojis
2019-05-03 16:27:51 +02:00
2f76a40d02
formatter.ex: Add get_emoji_map/1
2019-05-03 16:27:50 +02:00
d70af32127
Pleroma.User: remove emojify on parse_bio
2019-05-03 16:27:50 +02:00
85b5c60694
Pleroma.Formatter: width/height to class=emoji
2019-05-03 16:25:58 +02:00
c42ded13a2
Credo fixes.
2019-05-03 13:53:17 +02:00
acb04306b6
Standardize construction of websocket URL
...
This follows up on the change made in d747bd98
2019-05-03 11:45:04 +00:00
a0c755cc4a
MastodonApi: Bump api level.
2019-05-03 13:40:43 +02:00
81d1aa424d
Streamer: Stream out Conversations/Participations.
2019-05-03 13:39:14 +02:00
38b79461df
Fix embeded relationships in Mastodon API
...
Currently some endpoints render accounts without for user resulting in
embedded relationship being empty. It causes bugs in followers/following
tab in pleroma-fe but I fixed it for other endpoints as well just in
case
2019-05-03 00:49:17 +03:00
497d34b825
Merge branch 'iss-849' into 'develop'
...
Parse access_token from body parameters and URL parameters
See merge request pleroma/pleroma!1103
2019-05-02 14:17:17 +00:00
533d8cd581
Parse access_token from body parameters and URL parameters
2019-05-02 21:04:00 +09:00
3c4cab9be1
Merge branch 'develop' into update-oauth-template
2019-05-01 12:32:17 -05:00
9a98f48ec3
Remove incorrect statement about valid characters
2019-05-01 12:29:48 -05:00
8af55728e4
Fix tests
2019-05-01 19:03:55 +02:00
45f790becc
Merge remote-tracking branch 'origin/develop' into conversations_three
2019-05-01 18:40:41 +02:00
c854bff8f5
Refactored Pleroma.Web.Auth.Authenticator
2019-05-01 13:28:04 +00:00
51e26f14f7
Remove redundant ensure_scrubbed_html
...
It is never used as handling for fake and non-fake activities was merged
into one function above it
2019-05-01 13:52:44 +03:00
0bcdaf378e
Merge branch 'bugfix/web-notification-special-char' into 'develop'
...
fix the web push notification with special char for status created
See merge request pleroma/pleroma!1092
2019-05-01 10:45:32 +00:00
a3dc02d282
Add addressable lists
2019-05-01 16:11:17 +07:00
f11e7037c2
test fixes
2019-05-01 16:09:53 +07:00
bdfa3a6fa8
Merging with develop
...
Conflicts:
lib/pleroma/web/activity_pub/transmogrifier.ex
lib/pleroma/user.ex
2019-05-01 12:29:33 +07:00
85fa2fbce4
add scrubber for html special char
2019-05-01 01:37:17 +05:45
cd6da3606b
Merge branch 'develop' into bugfix/web-notification-special-char
2019-05-01 00:21:30 +05:45
ce4825c1dc
Do not normalize objects in stream_out unless the activity type is
...
Create
Saves quite a bit of time with delete activities because they would
always query the db
2019-04-30 20:21:28 +03:00
0f0cc2703b
Merge develop
2019-04-30 20:17:52 +07:00
b0951a8849
WebPush: Use Object.normalize, rewrite tests so they test reality.
2019-04-29 18:15:30 +02:00
0fd176b990
Merge branch 'fix/add-default-scope-mastoapi' into 'develop'
...
Add default_scope to /api/v1/update_credentials
See merge request pleroma/pleroma!1100
2019-04-29 06:45:18 +00:00
292c69481b
Merge branch 'regression/rights-only-for-admin' into 'develop'
...
Fix `rights` in TwitterAPI's user entity being present only for Admins/Moderators
See merge request pleroma/pleroma!1102
2019-04-28 23:05:14 +00:00
61ca2f7a4e
Fix `rights` in TwitterAPI's user entity being present only for
...
Admins/Moderators
In !1093 I reused `maybe_with_role` for `rights` object, however I
missed that `maybe_with_role` is called only for admins/moderators.
2019-04-28 19:42:43 +03:00
ce3789e39a
Add default_scope to /api/v1/update_credentials
2019-04-27 23:55:54 +03:00
c3e9fcf098
Fix bookmarks depending on embeded object and move checking if the
...
status is bookmarked to SQL
2019-04-27 23:06:46 +03:00
002ea343f8
Merge branch 'feature/bbcode' into 'develop'
...
BBCode support (backend)
See merge request pleroma/pleroma!1097
2019-04-27 07:44:24 +00:00
501af917b5
add support for bbcode
2019-04-26 22:35:02 +00:00
4de5fef1f8
Merge branch 'feature/807-bookmark-endpoint-extension' into 'develop'
...
Feature/807 bookmark endpoint extension
Closes #807
See merge request pleroma/pleroma!1059
2019-04-26 11:59:47 +00:00
48f68fd133
Merge branch 'feature/mastoapi-new-config' into 'develop'
...
Fix leaking private configuration parameters in Mastodon and Twitter APIs, and add new configuration parameters to Mastodon API
This patch:
- Fixes `rights` in TwitterAPI ignoring `show_role`
- Fixes exposing default scope of the user to anyone in Mastodon API
- Extends Mastodon API to be able to show and set `no_rich_text`, `default_scope`, `hide_follows`, `hide_followers`, `hide_favorites` (requested by the FE in #674 )
Sorry in advance for 500 line one commit diff, I should have split it up to separate MRs
See merge request pleroma/pleroma!1093
2019-04-26 02:41:35 +00:00
24c3e2db2c
Add mediaproxy whitelist capability
2019-04-25 18:11:47 -05:00
dfc8425659
Move settings to Source subentity
2019-04-25 10:31:14 +03:00
a825056d4d
test fixes
2019-04-25 14:09:57 +07:00
85953c0836
fixes for tests
2019-04-25 13:46:40 +07:00
229ce6abbc
migration without using old field name
...
removing old field from db, after bookmarks migration
2019-04-25 13:42:10 +07:00
3c2ae80008
unused
2019-04-25 13:42:10 +07:00
c157e27a00
Merge branch 'develop' into feature/disable-account
2019-04-25 13:41:10 +07:00
1258128f4f
favourites add bookmark display
2019-04-25 13:38:24 +07:00
324c9c8ab5
migrate user.bookmarks to separate table
2019-04-25 13:38:24 +07:00
73d01857e3
bookmarks in separate table
2019-04-25 13:38:24 +07:00
0fd0ffcd76
activitypub: transmogrifier: send reject follow if following does not succeed
2019-04-25 00:48:45 +00:00
4baea6e6d9
Fix leaking private configuration parameters in Mastodon and Twitter APIs, and add new configuration parameters to Mastodon API
...
This patch:
- Fixes `rights` in twitterapi ignoring `show_role`
- Fixes exposing default scope of the user to anyone in Mastodon API
- Extends Mastodon API to be able to show and set `no_rich_text`, `default_scope`, `hide_follows`, `hide_followers`, `hide_favorites` (requested by the FE in #674 )
Sorry in advance for 500 line one commit diff, I should have split it up to separate MRs
2019-04-24 20:01:42 +03:00
963d5774af
fix the status notification with special char
2019-04-24 07:06:17 +05:45
030a7876b4
Merge branch 'security/fix-html-class-scrubbing' into 'develop'
...
html: lock down allowed class attributes to only those related to microformats
See merge request pleroma/pleroma!1090
2019-04-23 23:07:56 +00:00
f5535e5743
html: lock down allowed class attributes to only those related to microformats
2019-04-23 23:03:45 +00:00
9dd36e5bcb
Extend Mastodon API with public endpoint for getting Favorites timeline of any user ( #789 )
2019-04-23 02:47:43 +00:00
10c40e13d2
Merge branch 'mastoapi/add-in-reply-to-screen-name' into 'develop'
...
Add `in_reply_to_account_acct` to MastoAPI status entity
See merge request pleroma/pleroma!1086
2019-04-23 02:43:53 +00:00
aa9d378985
Merge branch 'fix/normalize-activities' into 'develop'
...
Normalize acitvities instead of objects inside them
See merge request pleroma/pleroma!1085
2019-04-23 02:43:26 +00:00
d35246c449
added healthcheck setting to instance config
2019-04-22 17:00:06 +07:00
f60d072bbb
Add `pleroma.in_reply_to_account_acct` to MastoAPI status entity
2019-04-22 11:54:27 +03:00
d21d921def
Replace Object.normalize(activity.data[object] with Object.normalize(acitivty) to benefit from preloading
2019-04-22 11:27:29 +03:00
952a4ae68e
Fix unclosed ` and put synopsis into a code block in pleroma.emoji mix
...
task docs
2019-04-22 11:02:31 +03:00
b9cdf6d3b9
Use `User.get_cached*` everywhere
2019-04-22 07:20:43 +00:00
88f0be9693
Feature/826 healthcheck endpoint
2019-04-22 07:19:53 +00:00
e8c2f9a73a
Merge remote-tracking branch 'pleroma/develop' into feature/disable-account
2019-04-22 13:08:30 +07:00
7fcbda702e
Merge branch 'rework-emoji-management' into 'develop'
...
Remove finmoji and add a way to download emojis in packs
Closes #817 and #821
See merge request pleroma/pleroma!1073
2019-04-22 02:07:19 +00:00
3cefdc62e0
Fix emoji.txt / custom_emoji.txt / shortcode_globs handling
2019-04-21 23:07:14 +03:00
ba19ba8a88
Formatting
2019-04-21 22:33:54 +03:00
153f5375a6
Replace MD5 with SHA256 for emoji pack verification
2019-04-21 22:28:41 +03:00
d5c0fd35e1
Wrap the docstrings to 70 characters
2019-04-21 22:16:46 +03:00
4908e0eeee
Fix Credo warning
2019-04-21 23:24:33 +07:00
eeb093631c
Fix Credo warning
2019-04-21 23:19:36 +07:00
e56afefef9
Refactor conversation function in MastodonAPIController to use a View
2019-04-21 23:14:27 +07:00
2662bea4e0
Add accounts and last_status to conversation read response
2019-04-21 20:26:13 +07:00
f1d90ee942
Remove debug code
2019-04-21 16:40:05 +07:00
2359ee38b3
Set digest emails to false by default
2019-04-21 16:36:25 +07:00
9256d2d4b4
[ #923 ] Refactored OAuthController#authorize definitions, added test.
2019-04-21 10:51:32 +03:00
375fd21055
Set correct values in the MastoAPI reblog status view
2019-04-21 05:40:22 +03:00
24073f829f
Refactor query to return only 1 message instead of 20
2019-04-21 00:40:41 +07:00
724311e151
Fix Credo warnings
2019-04-20 19:57:43 +07:00
60f213bb1a
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/digest-email
2019-04-20 19:43:06 +07:00
64a2c6a041
Digest emails
2019-04-20 19:42:19 +07:00
8f93d4c423
Remove most finmoji mentions where appropriate
2019-04-20 15:42:14 +03:00
53a3e61016
Fix priv/static/instance/static to be just instance/static
...
It was a misunderstanding
2019-04-20 15:08:51 +03:00
31cff7dbca
Document the pleroma.emoji task
2019-04-20 15:06:07 +03:00
1e311d6662
Add a newline at the end of pack in ls-packs
2019-04-20 11:34:03 +03:00
52ed287e87
Fix incorrect multiple emoji tag handling introduced in initial impl
2019-04-20 11:17:17 +03:00
9bd5e2dec9
Make emoji default_manifest a config option
2019-04-20 11:17:17 +03:00
98d4b3de53
Treat the manifest path as a file if it doesn't start with http
2019-04-20 11:17:17 +03:00
aaaa428512
mix format
2019-04-20 11:17:17 +03:00
a141f0807b
Assume packs without emoji.txt only have emoji pictures, unhardcode
...
unhardcode: remove hardcoded /instance/static and actually use the config option
as it is used in other places.
packs without emoji.txt: these are now assumed to have .png files that
are all emojis, their names are used as shortcodes
2019-04-20 11:17:17 +03:00
eff725c3af
Add a task to generate emoji packs
2019-04-20 11:17:17 +03:00
1e44b5478d
Remove useless comment
2019-04-20 11:17:17 +03:00
c5b7286b5f
Move helper functions of emoji manager task down in the file
2019-04-20 11:17:17 +03:00
06db3ee1a8
Add MD5 verification for emoji pack source
2019-04-20 11:17:17 +03:00
af5494f942
Separate emoji pack file lists in a different file
...
The file should be in the same directory as the manifest file
2019-04-20 11:17:17 +03:00
21b39c54a3
Allow using a custom manfest and getting multiple packs at once
...
A custom manifest can be provided as a command-line options --manifest/-m
2019-04-20 11:17:17 +03:00
c26724cc55
Remove finmoji and add a way to download emojis in packs
...
These packs are stored in a git repo on pleroma gitlab
2019-04-20 11:17:17 +03:00
fa48532387
Handle `reblogs` on the first follow request in MastoAPI
2019-04-20 04:39:49 +03:00
9da8b287f8
Merge branch 'feature/database-compaction' into 'develop'
...
database compaction
See merge request pleroma/pleroma!473
2019-04-19 16:55:33 +00:00
73407f4eea
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/digest-email
2019-04-19 23:27:13 +07:00
bc7862106d
Fix tests
2019-04-19 23:26:41 +07:00
8add119444
Add User.list_inactive_users_query/1
2019-04-19 22:19:00 +07:00
aeafa0b2ef
Add Notification.for_user_since/2
2019-04-19 22:16:17 +07:00
ada384207b
typo fix
...
docs for RelMe provider
2019-04-19 07:50:21 +00:00
218d96a26b
Merge branch '923_oauth_consumer_refactoring_ci' into 'develop'
...
OAuth consumer params handling refactoring
See merge request pleroma/pleroma!1047
2019-04-19 07:49:26 +00:00
f9865cf943
Stream out deletes, mistakingly removed when resolving merge conflicts
2019-04-19 00:47:02 +03:00
73b8c5387b
Add some logging
2019-04-19 00:17:37 +03:00
945325013a
remove query timeouts
2019-04-18 23:58:59 +03:00
099f89367e
Replace embedded object migration with a mix task
2019-04-18 23:34:01 +03:00
9238dccac1
Add a guard to fetching reply activity
2019-04-18 21:40:40 +03:00
eba3db0966
Merge branch 'bugfix/filter-boosted-blocks' into 'develop'
...
activitypub: fix filtering of boosts from blocked users
See merge request pleroma/pleroma!1074
2019-04-18 18:29:57 +00:00
1aa4994f6d
Do not require authentication for user search in MastoAPI
2019-04-18 12:44:25 -05:00
a11ca87f40
Add a migration to remove embeded objects
2019-04-18 13:10:38 +03:00
83589ca6a5
Merge branch 'develop' into feature/database-compaction
2019-04-18 12:56:38 +03:00
ac04311b3f
Fix search in TwitterAPI
2019-04-18 10:24:06 +03:00
6069d0fd36
Fix object search depending on embeded object
2019-04-18 09:28:20 +03:00
e31a22043b
Fix media timeline depending on embeded object and add some guards
2019-04-18 08:31:08 +03:00
2abc09570f
Use the preloaded object in tag queries
2019-04-18 01:37:04 +03:00
36f78c6dcd
activitypub: fix filtering of boosts from blocked users
2019-04-17 22:27:59 +00:00
2140e164d7
activitypub: properly filter out transitive activities concerning blocked users
2019-04-17 20:05:09 +00:00
35ac672b8d
Remove containment tests from transmogrifier and fix thread visibility solver
2019-04-17 17:59:15 +03:00
4c289e924e
Fix delete-by_ap_id to expect not only embeded objects
2019-04-17 16:35:01 +03:00
8e4d950f31
Remove updating reply count for embeded objects
2019-04-17 15:54:09 +03:00
c3a2052806
If it's an object struct it is already normalized
2019-04-17 15:11:22 +03:00
a53b917e7f
oof
2019-04-17 14:55:26 +03:00
ad681877df
Make credo happy
2019-04-17 14:52:01 +03:00
e641651e2b
Fix unbookmarking
2019-04-17 14:27:02 +03:00
e7c3c36766
Update functions in object fetcher for tesla and set up a proper mock for tests
2019-04-17 14:21:39 +03:00
b09ae02c04
Added some more normalization calls all in mastodon api controller
2019-04-17 13:04:58 +03:00
2f0203a4a1
Resolve conflicts
2019-04-17 16:59:05 +07:00
87013f8438
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/digest-email
2019-04-17 16:58:08 +07:00
462028688b
Fix pinned posts relying on embded objects
2019-04-17 12:34:19 +03:00
627e5a0a49
Merge branch 'develop' into feature/database-compaction
2019-04-17 12:22:32 +03:00
128aae05f3
[ #923 ] Minor semantic adjustment.
2019-04-17 11:33:21 +03:00
73df3046e0
Merge branch 'feature/788-separate-email-addresses' into 'develop'
...
Feature/788 separate email addresses
Closes #788
See merge request pleroma/pleroma!1040
2019-04-16 18:44:07 +00:00
02a53d00c9
Merge branch 'fix/remote-follow-auth' into 'develop'
...
Fix: remote follows should not ask user to log-in again for authorization
See merge request pleroma/pleroma!1060
2019-04-16 18:40:56 +00:00
cde7711b12
Merge branch 'bugfix/relax-spam-protection' into 'develop'
...
activitypub: allow indirect messages from users being followed at a personal inbox
See merge request pleroma/pleroma!1069
2019-04-16 18:38:11 +00:00
d4a749cfb2
Handle new-style mastodon follow lists
...
Fixes https://git.pleroma.social/pleroma/pleroma/issues/814
2019-04-16 18:35:38 +00:00
750b369d04
activitypub: allow indirect messages from users being followed at a personal inbox
2019-04-16 18:31:12 +00:00
6e26ac10a3
make Pleroma.Endpoint use extra_cookie_attrs in config
2019-04-16 22:20:56 +08:00
76999c73a7
Conversation: Add accounts to output.
2019-04-15 22:28:42 +02:00
0da985182f
Conversation: Return full status object, id is a string.
2019-04-15 21:58:58 +02:00
c1ebb38d3a
Conversation: Also create participations for remote users.
...
Needed to get the participating user list.
2019-04-15 21:45:25 +02:00
56956de6fa
Merge branch 'fix/status-reblogged' into 'develop'
...
Assign reblogged in the Mastodon reblog status view
Closes #812
See merge request pleroma/pleroma!1057
2019-04-15 10:26:23 +00:00
f358295cbe
Merge branch 'unfollow-oneself' into 'develop'
...
Consistent response for self follow/unfollow
Closes #819
See merge request pleroma/pleroma!1061
2019-04-15 10:24:37 +00:00
27d78dc526
Use User.get_cached_by*
2019-04-15 12:37:49 +03:00
5d73dca064
Remove inReplyToStatusId
2019-04-15 11:50:36 +03:00
507e7821e3
Handle follow/unfollow directed to themselves
2019-04-15 10:21:18 +03:00
dc21181f65
Update updated_at field on notification read
2019-04-14 22:29:05 +07:00
e513504e88
Revert "Assert on the success of enqueue before returning"
...
This reverts commit 16d8c8b33b
2019-04-14 16:12:54 +01:00
16d8c8b33b
Assert on the success of enqueue before returning
2019-04-14 16:05:26 +01:00
5e45557751
Always return {atom, _} from try_send_confirmation
2019-04-14 16:01:48 +01:00
ec42b639a3
fix pattern match on user registration
...
deliver_async will return a single atom
2019-04-14 15:46:54 +01:00
679a8ef629
Assign reblogged in the Mastodon reblog status view
2019-04-14 11:35:15 +03:00
0cd4b6024d
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/digest-email
2019-04-14 14:05:21 +07:00
371a4aed2c
Add User.Info.email_notifications
2019-04-13 17:40:42 +07:00
c349573791
Merge develop to 788-separate-email-addresses
...
Merge conflicts:
test/web/twitter_api/twitter_api_test.exs
test/web/twitter_api/twitter_api_controller_test.exs
test/web/admin_api/admin_api_controller_test.exs
2019-04-13 12:24:38 +07:00
a64eb2b389
fallback to the old behaviour
...
admin and user mailers
2019-04-13 12:20:36 +07:00
f9af90c5aa
Revert "simplify mentions escape"
...
This reverts commit f3e06a1030636f24f7129dd93bb9780e67fb7de1.
2019-04-12 19:25:53 +00:00
184ae60b21
Merge branch 'bugfix/pleroma-email-naming' into 'develop'
...
Make the filename and module name of Pleroma.Emails.* orthogonal
See merge request pleroma/pleroma!1029
2019-04-12 10:41:09 +00:00
dd097a406b
add tests
2019-04-12 16:38:32 +07:00
0a09692c7d
Merge branch 'features/mastoapi/2.6.0-min_id-pagination' into 'develop'
...
Features: mastoapi-2.6.0 `min_id` pagination
Closes #351
See merge request pleroma/pleroma!976
2019-04-12 09:34:12 +00:00
57d5ff57d6
Merge branch 'fix/732-password-align' into 'develop'
...
password reset page labels align
See merge request pleroma/pleroma!986
2019-04-12 09:13:30 +00:00
711ade961e
adding destroy multiple for mastofe
2019-04-12 02:28:46 +00:00
e03d24af96
in_reply_to_id - null
2019-04-12 02:21:32 +00:00
31c06dba5a
Merge branch 'fix/hackney_max_body_param' into 'develop'
...
Add `with_body: true` to requests relying on `max_body: val`
Closes #778
See merge request pleroma/pleroma!1049
2019-04-11 17:54:31 +00:00
4615e56219
Add `with_body: true` to requests relying on `max_body: val`
2019-04-12 00:16:33 +07:00
d6d5f46bae
Update OAuth web template
2019-04-11 16:02:38 +00:00
46bd5c1d87
fix format
2019-04-11 17:28:12 +07:00
db4badc6aa
move user disable into deactivation
2019-04-11 17:22:42 +07:00
0f2f7d2cec
Merge remote-tracking branch 'pleroma/develop' into feature/disable-account
2019-04-11 15:51:52 +07:00
c3f12cf3c3
[ #923 ] OAuth consumer params handling refactoring.
...
Registration and authorization-related params are wrapped in "authorization" in order to reduce edge cases number and simplify handling logic.
2019-04-10 21:40:38 +03:00
d115d2a27e
Conversations: Tidying up.
2019-04-10 18:17:22 +02:00
c352a0aba6
Conversations: Make tests run.
2019-04-10 17:48:31 +02:00
cf353514fe
Participations: Add last activity.
2019-04-10 17:28:02 +02:00
20d9b90760
Participation: Get for a user.
2019-04-10 17:05:33 +02:00
280172f6f6
Conversations: Create or bump on inserting a dm.
2019-04-10 16:33:45 +02:00
64c1c3a407
Participations: Add marking as read and unread.
2019-04-10 15:12:01 +02:00
d1da6b155a
Conversation: Add Conversations and Participations.
2019-04-10 15:01:42 +02:00
fe511a6c65
Merge branch 'develop' into feature/788-separate-email-addresses
2019-04-10 18:06:54 +07:00
fe13a1d78c
adding notify_email setting for trigger emails
2019-04-10 17:57:41 +07:00
e5d553aa45
Merge branch 'feature/767-multiple-use-invite-token' into 'develop'
...
Feature/767 multiple use invite token
See merge request pleroma/pleroma!1032
2019-04-10 10:10:08 +00:00
be8350baa2
Merge branch 'develop' into feature/user-status-subscriptions
2019-04-10 10:44:54 +01:00
c8440b5e0c
Merge branch 'fix/emoji-api-nonsense' into 'develop'
...
Change response format of /api/pleroma/emoji so it makes sense
See merge request pleroma/pleroma!1038
2019-04-10 06:22:51 +00:00
9c1b36856b
s/Pleroma.UserEmail/Pleroma.Emails.UserEmail/
2019-04-10 06:33:20 +02:00
cae0231731
s/Pleroma.AdminEmail/Pleroma.Emails.AdminEmail/
2019-04-10 06:33:20 +02:00
1791ee8ec4
s/Pleroma.Mailer/Pleroma.Emails.Mailer/
2019-04-10 06:33:19 +02:00
0ab563d334
Merge branch 'hotfix/fix_undefined_summary' into 'develop'
...
transmogrifier.ex: Add fix_summary/1
See merge request pleroma/pleroma!1039
2019-04-10 02:10:47 +00:00
97395e013e
Merge branch 'notification-pleroma-settings' into 'develop'
...
Notification controls
Closes #738
See merge request pleroma/pleroma!988
2019-04-10 02:10:31 +00:00
cf9ba8fe1b
transmogrifier.ex: Add fix_summary/1
...
MRF.KeywordPolicy assumes that summary is present in a activity,
and this would probably simplify code elsewhere too anyway.
2019-04-10 02:32:04 +02:00
b57b43027c
Change response format of /api/pleroma/emoji to the one that actually makes sense
2019-04-09 23:20:31 +03:00
144648de92
Merge branch 'mastoapi/plaintext-statuses' into 'develop'
...
Provide plaintext representations of content/cw in MastoAPI
Closes #787
See merge request pleroma/pleroma!1035
2019-04-09 17:25:31 +00:00
0a02ed7a2f
Merge branch 'bugfix/follower_count' into 'develop'
...
update the follower count when a follower is blocked
See merge request pleroma/pleroma!1033
2019-04-09 07:30:38 +00:00
07afb9b537
update the follower count when a follower is blocked
2019-04-09 09:15:45 +05:45
589629cf3e
Used cached user resources in subscriptions
2019-04-08 15:56:14 +01:00
fee50636d0
removing not needed invite update
2019-04-08 20:08:16 +07:00
d0696fdfd6
fix for elixir 1.7.4
2019-04-08 19:16:59 +07:00
a9f805c871
Merge remote-tracking branch 'origin/develop' into features/mastoapi/2.6.0-conversations
2019-04-08 14:10:51 +02:00
87a01f9ee0
Use Pleroma.Config instead of Application.get_env
2019-04-08 13:04:30 +01:00
9abf832b03
Merge remote-tracking branch 'pleroma/develop' into use-jobs-in-webpush
2019-04-08 18:48:10 +07:00
13ff312c48
Sever subscription in case of block
2019-04-08 12:46:12 +01:00
e19590c93f
Merge branch 'improve_upgrade_user_from_ap_id' into 'develop'
...
Improve Transmogrifier.upgrade_user_from_ap_id/2
See merge request pleroma/pleroma!1019
2019-04-08 11:42:20 +00:00
fd45cab9ec
Merge branch 'twitter_oauth' into 'develop'
...
OAuth consumer (sign in / sign up with external provider)
See merge request pleroma/pleroma!923
2019-04-08 11:41:50 +00:00
36c0a10fdf
adding language tag
2019-04-08 11:03:10 +00:00
23067908de
Merge branch 'feature/770-add-emoji-tags' into 'develop'
...
Feature/770 add emoji tags
See merge request pleroma/pleroma!998
2019-04-08 09:50:00 +00:00
c3d5c3513a
Merge remote-tracking branch 'pleroma/develop' into use-jobs-in-webpush
2019-04-08 16:46:59 +07:00
a1a854646e
Merge branch 'develop' into use-jobs-in-webpush
2019-04-08 16:29:20 +07:00
bffddf5e31
[ #923 ] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
...
# Conflicts:
# docs/config.md
# test/support/factory.ex
2019-04-08 12:20:26 +03:00
b4da2bc1d0
Merge branch 'develop' into 'improve_upgrade_user_from_ap_id'
...
# Conflicts:
# config/config.exs
# docs/config.md
2019-04-08 09:18:01 +00:00
b177e1e7f3
Merge branch 'scheduled-activities' into 'develop'
...
Scheduled activities
See merge request pleroma/pleroma!989
2019-04-08 09:08:18 +00:00
012bb5dcc9
renaming expire_at -> expires_at
...
keyword style change
2019-04-08 16:01:28 +07:00
76fdfd1c7f
Add check on activity visibility in sub notification
2019-04-07 15:11:29 +01:00
56c75aec12
credo fix
2019-04-07 20:59:53 +07:00
b810aac117
added docs to docs/api/admin_api.md
...
code style and little renamings
2019-04-07 19:48:52 +07:00
e3328bc138
[ #923 ] Removed <br> elements from auth forms, adjusted docs, minor auth settings refactoring.
2019-04-07 11:08:37 +03:00
fb2040d061
Merge branch 'fix/deactivated-user-error' into 'develop'
...
Return 403 for deactivated user on token request
Closes #785
See merge request pleroma/pleroma!1031
2019-04-06 22:19:30 +00:00
2056efa714
Add scheduler for sending scheduled activities to the queue
2019-04-06 23:56:29 +03:00
fc92a0fd8d
Added limits and media attachments for scheduled activities.
2019-04-06 23:55:58 +03:00
b3870df51f
Handle `scheduled_at` on status creation.
2019-04-06 23:55:58 +03:00
7bf622ce73
Add scheduled activities
2019-04-06 23:55:58 +03:00
7aa53d52bd
Return 403 on oauth token exchange for a deactivated user
2019-04-06 23:27:55 +03:00
ce8d457132
little channges
2019-04-06 22:38:35 +07:00
c05fe4da0a
Document subscription endpoints, fix typos
...
Also adds a quick error case on the subscription endpoints
to avoid 500s
2019-04-06 16:20:06 +01:00
9aeac7dcca
Merge branch 'feature/prometheus' into 'develop'
...
Upstream: Metrics and debugging
See merge request pleroma/pleroma!1020
2019-04-06 14:51:46 +00:00
a53d591ac5
code style
2019-04-06 20:47:05 +07:00
7410aee886
Merge develop to 770-add-emoji-tags
...
Merge conflict in test/web/mastodon_api/mastodon_api_controller_test.exs
2019-04-06 20:34:00 +07:00
dcc54f8cfa
admin api endpoints for invites
2019-04-06 20:25:19 +07:00
47b07cec49
token -> invite renaming
2019-04-06 20:24:22 +07:00
be54e40890
twitter api registration
...
fix for twitter api tests
2019-04-06 17:18:59 +07:00
0484f3a8b1
generating tokens with mix
2019-04-06 16:58:22 +07:00
325a268017
Redirect to the referer url after mastofe authorization
2019-04-05 23:36:42 +00:00
b5a2d384f7
Redundant Repo.get_by usage was recently removed from the codebase
2019-04-05 11:41:41 -05:00
7895ee37fa
Add user following / unfollowing to the admin api.
2019-04-05 11:27:07 -05:00
9ca91cbb87
Change relationship direction of subscriptions
2019-04-05 17:02:07 +01:00
d35f6551c1
Move subscriptions endpoint to be under /pleroma
2019-04-05 17:02:02 +01:00
d56866c824
Add subscribed status to user view
...
Added in pleroma extensions, but can be moved whenever
2019-04-05 15:30:31 +01:00
316fe20d86
Make subscriptions the same direction as blocks
...
That being, user - subscribes to -> users, rather than
user - has subscribers -> users
2019-04-05 15:30:26 +01:00
23c4f49494
Fix subscription endpoint return formats
2019-04-05 15:30:24 +01:00
007762e767
Add notification checks
2019-04-05 15:30:23 +01:00
79910ce5cc
Add API endpoints and user column for subscription
2019-04-05 15:30:18 +01:00
1c2e4f88d1
fix credo
2019-04-05 19:46:28 +07:00
f1712cd2f1
Use PleromaJobQueue in Pleroma.Web.Push
2019-04-05 19:38:44 +07:00
f0f30019e1
Refactor html caching functions to have a key instead of a module, use more correct terminology and fix summaries in mastoapi
2019-04-05 15:19:44 +03:00
47a236f753
[ #923 ] OAuth consumer mode refactoring, new tests, tests adjustments, readme.
2019-04-05 15:12:02 +03:00
3e7f2bfc2f
[ #923 ] OAuthController#callback adjustments (with tests).
2019-04-05 09:19:17 +03:00
45765918c3
[ #923 ] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
...
# Conflicts:
# mix.exs
2019-04-04 23:43:08 +03:00
f7cd9131d4
[ #923 ] OAuth consumer controller tests. Misc. improvements.
2019-04-04 22:41:03 +03:00
69038887b2
Code readability tweak
2019-04-04 12:36:57 -05:00
0b5c818cb7
[ #1 ] fix telemetry
2019-04-04 11:35:09 -05:00
bc3618a38d
Set up telemetry and prometheus
2019-04-04 11:30:43 -05:00
cfa6e7289f
Improve Transmogrifier.upgrade_user_from_ap_id/2
2019-04-04 16:10:43 +07:00
af0065a71f
mastodon_api_controller.ex: Add pleroma-tan to initial_state
2019-04-04 09:07:25 +02:00
3f8be270c6
Merge branch 'feature/robotstxt' into 'develop'
...
Generate permissive or restrictive robots.txt in the config generator
See merge request pleroma/pleroma!1012
2019-04-03 17:31:34 +00:00
cd41584ac4
Generate permissive or restrictive robots.txt in the config generator
2019-04-03 22:12:58 +05:45
79cb34a4b0
Fix preview not being usable in form data
2019-04-02 23:07:16 +03:00
0cb94cfa94
Merge branch 'fix-slow-relationships' into 'develop'
...
ActivityPub Utils: Greatly speed up the follow / block activity fetching.
See merge request pleroma/pleroma!1011
2019-04-02 18:43:48 +00:00
256b492a58
Merge branch 'bugfix/wrong-date-format' into 'develop'
...
Support activities with dates in the Unix timestamp format
Closes #763
See merge request pleroma/pleroma!1004
2019-04-02 14:18:23 +00:00
a79ce94dd4
Merge branch 'feature/fake-statuses' into 'develop'
...
Add fake status submit
See merge request pleroma/pleroma!995
2019-04-02 14:17:43 +00:00
39bcf93007
Merge remote-tracking branch 'origin/develop' into fix-slow-relationships
2019-04-02 16:10:38 +02:00
fd07745d1b
ActivityPub Utils: Greatly speed up the follow / block activity fetching.
2019-04-02 16:08:55 +02:00
fa8483cb80
Merging develop into feature/770-add-emoji-tags
...
Conflict test/web/twitter_api/util_controller_test.exs
2019-04-02 20:39:52 +07:00
d140738edf
second level of headertext change in doc
2019-04-02 20:36:36 +07:00
180b87257c
Merge branch 'bugfix/share-mastodon' into 'develop'
...
[OStatus] adds status to pleroma instance if the url given is a status
See merge request pleroma/pleroma!1002
2019-04-02 12:47:40 +00:00
ce9284b36f
Merge branch 'remove-user-activities' into 'develop'
...
[#757 ] Add mix task to delete user's activities
See merge request pleroma/pleroma!1008
2019-04-02 12:45:29 +00:00
b95cf3d490
Merge branch 'get_by_id' into 'develop'
...
Replace `Repo.get_by` with existing functions
See merge request pleroma/pleroma!1010
2019-04-02 12:43:28 +00:00
9e0567ec52
Merge develop into feature/770-add-emoji-tags
2019-04-02 19:16:29 +07:00
fdb4357e9b
Rename fake param to preview and make the tests check that the object was not inserted to the db
2019-04-02 14:31:18 +03:00
37925cbe78
Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
...
# Conflicts:
# lib/pleroma/web/oauth/oauth_controller.ex
# lib/pleroma/web/router.ex
2019-04-02 14:05:34 +03:00
091baf9316
Merge branch 'features/mastoapi/2.6.0-force-login-option' into 'develop'
...
MastoAPI 2.6.0 `force_login` option
Closes #734
See merge request pleroma/pleroma!999
2019-04-02 10:57:38 +00:00
26d509cc86
Merge branch 'get_by_id' into 'develop'
...
Replace `Repo.get(Module, id)` with `Module.get_by_id(id)` where possible
See merge request pleroma/pleroma!1009
2019-04-02 10:52:29 +00:00
95c92c49c9
Fix account lookup for nicknames beginning with numbers
2019-04-02 10:51:33 +00:00
590c935d95
[ #923 ] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
...
# Conflicts:
# mix.exs
2019-04-02 13:50:12 +03:00
88d3cb44c3
replace `Repo.get_by(User, nickname: nickname)` with `User.get_by_nickname(nickname)`
2019-04-02 17:47:02 +07:00
1b3d921921
change `Repo.get(User, id)` => `User.get_by_id(id)`
2019-04-02 17:01:26 +07:00
4212527928
change `Repo.get(Activity, id)` => `Activity.get_by_id(id)`
2019-04-02 16:50:31 +07:00
3db9235150
Ignore dates in wrong formats
2019-04-02 11:32:36 +02:00
a14742f495
add `user delete_activities` mix task
2019-04-02 16:30:11 +07:00
08d64b977f
little changes and typos
2019-04-02 16:13:34 +07:00
9b2188da7c
refactoring of emoji tags config to use groups
2019-04-02 15:44:56 +07:00
a1869f5272
Merge remote-tracking branch 'pleroma/develop' into remove-user-activities
2019-04-02 15:41:30 +07:00
f20e8d28de
add support for all status type (ostatus) and replase case with if
2019-04-02 12:18:00 +05:45
aac48d0cc6
Merge remote-tracking branch 'remotes/upstream/develop' into features/mastoapi/2.6.0-conversations
2019-04-02 09:19:10 +03:00
6386c1c9c1
fetch url for OStatus to know if it is a/c or status
2019-04-02 10:26:09 +05:45
f56eef8d8c
router: Add fake identity proof endpoint
2019-04-02 01:53:38 +02:00
b6f9f7b8aa
Handle dates in the Unix timestamp format ( Fixes #763 )
2019-04-01 22:45:24 +02:00
1d01e8e656
[OStatus] adds status to pleroma instance if the url given is a status
2019-04-01 22:26:58 +05:45
6910fb371b
Fixed local MastoFE authentication / `force_login` option.
2019-04-01 17:25:25 +03:00
cbe09d94d1
Added `force_login` authentication option (previously applied by default).
2019-04-01 14:46:50 +03:00
17d3d05a71
code style
...
little fix
2019-04-01 17:54:30 +07:00
3601f03147
Adding tag to emoji ets table
...
changes in apis
2019-04-01 17:17:57 +07:00
fe5145eeaa
Move putting fake attribute to lib/pleroma/web/activity_pub/utils.ex
2019-04-01 12:25:53 +03:00
975482f091
insert object defaults for fake activities and make credo happy
2019-04-01 12:16:51 +03:00
d866b59eea
oof
2019-04-01 11:58:08 +03:00
45ba10bf47
Fix the issue with HTML scrubber
2019-04-01 11:55:59 +03:00
804173fc92
[ #923 ] Minor code readability fix.
2019-04-01 09:45:44 +03:00
eadafc88b8
[ #923 ] Deps config adjustment (no `override` for `httpoison`), code analysis issues fixes.
2019-04-01 09:28:56 +03:00
baffdcc480
[ #923 ] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
...
# Conflicts:
# mix.exs
2019-04-01 08:49:32 +03:00
629ad1766c
BBS: Some fixes.
2019-03-31 21:53:17 +02:00
e3bf6655ba
Add replying.
2019-03-31 21:24:29 +02:00
10fdc080a0
BBS: Tests and formatting.
2019-03-31 20:35:10 +02:00
17ab9fa45b
BBS: Some more functionality.
2019-03-31 18:01:16 +02:00
c810fb81a4
Basic SSH daemon.
2019-03-31 14:55:09 +02:00
cd387f8693
Add a fake option to lazy_put_actvity_defaults
2019-03-30 13:57:54 +03:00
1bb4d5d65b
Implement fake status submit
2019-03-29 21:59:04 +03:00
9a39d1d846
Replace Pleroma.Jobs with `pleroma_job_queue`
2019-03-29 12:46:05 +00:00
c8abef373b
mastodon_api_controller.ex: fallback to first for min_id
2019-03-28 17:23:21 +01:00
6b407872b4
mastodon_api_controller.ex: Use min_id in link header instead of since_id
2019-03-28 17:23:21 +01:00
e83ad12c57
pagination.ex: Drop atom keys in params
...
Atom keys could also have been transformed to string, or the other
way around but this one is more efficient and what we actually
expect with the current param_types in Pagination
2019-03-28 17:18:59 +01:00
6f15224053
activity_pub.ex: Move limit/max_id restrictions to Pagination helpers
2019-03-28 17:18:59 +01:00
cd90695a34
Add PUT /api/pleroma/notification_settings endpoint
2019-03-28 18:55:16 +03:00
55d086b520
Notification controls
...
Allow users to configure whether they want to receive notifications from people they follow / who follow them, people from remote / local instances
2019-03-28 07:52:07 +03:00
10c81fc902
Add user show endpoint for Pleroma admin API
2019-03-27 21:44:15 +03:00
3ca6c4f443
password reset page labels align
2019-03-27 22:37:20 +06:30
20e0f36605
Merge remote-tracking branch 'remotes/origin/develop' into twitter_oauth
2019-03-27 15:41:40 +03:00
2a95014b9d
[ #923 ] OAuth consumer improvements, fixes, refactoring.
2019-03-27 15:39:35 +03:00
926bf114b7
Merge branch 'feature/more-user-filters' into 'develop'
...
Add more user filters + move search to its own module
See merge request pleroma/pleroma!982
2019-03-27 11:33:13 +00:00
ce6d64bbd8
Fix missing announces in MastoAPI home timeline
...
Closes #762
2019-03-27 12:28:53 +03:00
3cf7539bca
Add more user filters + move search to its own module
2019-03-27 03:51:59 +05:00
a4ab60ac54
Add vapid_key to the `POST /api/v1/apps` response
2019-03-26 23:27:37 +03:00
691d1208b5
Add GET /api/v1/apps/verify_credentials
2019-03-26 21:53:28 +03:00
ff3b09f6b3
Merge branch 'fix/ap-icon' into 'develop'
...
Do not federate instance avatar
Closes #759
See merge request pleroma/pleroma!977
2019-03-26 16:12:50 +00:00
c6ab5ebe7c
Merge branch 'features/mastoapi/2.7.2-instance-attributes' into 'develop'
...
Mastodon 2.7.2 instance attributes (registrations, languages)
See merge request pleroma/pleroma!979
2019-03-26 16:01:52 +00:00
10a7a4a868
AP UserView: Refactor banner / avatar display code, add test.
2019-03-26 16:59:28 +01:00
9e3899bf36
Merge branch 'features/mastoapi/2.7.0-auth-error-messages' into 'develop'
...
Mastodon-based auth error messages. User#auth_active?/1 refactoring.
See merge request pleroma/pleroma!978
2019-03-26 15:13:55 +00:00
21ff78cd40
Merge branch 'replies-count' into 'develop'
...
Increment replies_count (MastoAPI)
Closes #756
See merge request pleroma/pleroma!974
2019-03-26 14:49:09 +00:00
406d19331f
Remove ActivityRepresenter
2019-03-26 17:16:21 +03:00
eef1042b16
Mastodon 2.7.2 instance attributes (registrations, languages).
2019-03-26 16:27:17 +03:00
568e348588
Increment replies_count on replies (MastoAPI)
2019-03-26 15:27:04 +03:00
b0759f821b
Comments split.
2019-03-26 15:24:29 +03:00
263ca3dea2
Mastodon-based auth error messages. Defaulted User#auth_active?/1 to `true`.
2019-03-26 15:09:06 +03:00
c410296120
Try sending an empty map
2019-03-25 19:00:35 -05:00
6f090f981b
Attempt to fix incorrect federation of default instance avatars
2019-03-25 18:47:04 -05:00
b028b0f97d
Merge branch 'bugfix/missing-announces' into 'develop'
...
fix up missing announcements with preloads
See merge request pleroma/pleroma!972
2019-03-25 09:24:08 +00:00
26b0c802c3
fix up missing announcements with preloads
2019-03-25 07:38:09 +00:00
bc14c98de1
Merge branch 'features/s3-uploader-digital-ocean' into 'develop'
...
add overriding truncated_namespace condition for truncating paths for digital ocean
See merge request pleroma/pleroma!969
2019-03-25 02:25:59 +00:00
63ffa4842c
Merge branch 'fix/mastoapi-liked' into 'develop'
...
Serve non-public activities in /api/v1/favourites
Closes #648
See merge request pleroma/pleroma!970
2019-03-25 02:24:27 +00:00
a7f58b3c13
Serve non-public activities in /api/v1/favourites
...
Fixes #648
2019-03-25 02:15:45 +03:00
6c96d68f77
add overriding truncated_namespace condition for truncating paths for digital ocean
2019-03-24 11:32:09 -07:00
750de7d842
Merge branch 'features/mrf-keyword-nil-summary' into 'develop'
...
mrf/keyword_policy.ex: Fix when summary == nil, do not whitelist content == nil
See merge request pleroma/pleroma!968
2019-03-24 15:02:13 +00:00
eab9425cc4
mrf/keyword_policy.ex: Fix when summary == nil, do not whitelist content == nil
2019-03-24 15:47:50 +01:00
4aa699271c
activity: use left join instead of inner join when fetching activities that may or may not have a child object
2019-03-23 03:17:50 +00:00
332dc1371b
user: use preloads when deleting accounts
2019-03-23 03:06:00 +00:00
debf7f016d
ostatus: use preload objects with Object.normalize() when opportunistic
2019-03-23 03:05:57 +00:00
3c2350cbee
object: downgrade normalize warning to debug severity
2019-03-23 03:05:15 +00:00
8c70156157
activitypub: object view: use preloaded object when possible
2019-03-23 03:05:14 +00:00
f9d5c13b21
activity: add get_by_ap_id_with_object()
2019-03-23 03:05:13 +00:00
ce47eb8b29
activitypub: when fetching objects, use the preloaded object from the synthesized activity
2019-03-23 03:05:10 +00:00
aabcecb269
notification: formatting
2019-03-23 02:30:53 +00:00
07cdd9ed02
streamer: use the preloaded object if possible
2019-03-23 02:29:01 +00:00
c62220c500
rich media: helpers: only crawl Create activities
2019-03-23 02:28:59 +00:00
9a06d9f6e8
notification: preload child objects
2019-03-23 02:28:57 +00:00
4cedf45423
relay: use preloaded object since we always have it
2019-03-23 02:28:56 +00:00
e430a71d37
ostatus: fetch preloaded object in note handler for testsuite
2019-03-23 01:17:26 +00:00
73efe95368
activitypub: allow skipping preload in some cases (like certain tests where the preload is obnoxious)
2019-03-23 01:09:12 +00:00
ba7299fc87
activitypub: add missing with_preloaded_object()
2019-03-23 00:53:35 +00:00
e4307cadc8
activitypub: splice in the child object if we have one
2019-03-23 00:40:08 +00:00
a6973a668e
formatting
2019-03-23 00:28:16 +00:00
59518cbcd8
activity: fix credo nitpick
2019-03-23 00:26:12 +00:00
b3bf523c09
rich media: use optimized Object.normalize()
2019-03-23 00:22:57 +00:00
e75e43b949
common api: use the optimized Object.normalize whenever possible
2019-03-23 00:22:14 +00:00
9aea7cc224
activitypub: preload child objects when fetching timelines
2019-03-23 00:10:17 +00:00
092cedede5
activity: add with_preloaded_object() convenience
2019-03-23 00:09:56 +00:00
62bccddde0
object: add support for preloading objects when walking an activity graph in normal form
2019-03-22 23:51:12 +00:00
1b33986bfa
Fix text being nullable in TwitterAPI
2019-03-23 00:10:50 +03:00
fee360e581
Merge branch 'safe-mentions' into 'develop'
...
NodeInfo: Return safe_dm_mentions feature flag.
See merge request pleroma/pleroma!964
2019-03-22 11:03:56 +00:00
e2afce34b6
NodeInfo: Return safe_dm_mentions feature flag.
2019-03-22 11:57:20 +01:00
3229c7a1d6
Ensure fts is prefered over trigram and use union_all instead of union in user search query
2019-03-22 08:39:49 +03:00
27e03a2177
reports: fix up email generation for remote reports
2019-03-22 01:17:14 +00:00
1c3d3d0c2b
Merge branch 'safe-mentions' into 'develop'
...
Add safe dm mode option.
See merge request pleroma/pleroma!958
2019-03-22 00:50:24 +00:00
3cc2554fa3
mastodon api: add conversation_id extension (ref #674 )
2019-03-21 23:25:41 +00:00
fea3696799
common api: move context functions from twitterapi
2019-03-21 23:24:04 +00:00
bf8b29e080
Merge branch 'feature/move-search-to-db' into 'develop'
...
Move gluing search results from application to database and get mutuals a higher score multiplier
See merge request pleroma/pleroma!960
2019-03-21 21:41:04 +00:00
88096c65a5
Move gluing search results from application to database and get mutuals
...
a higher score multiplier
2019-03-21 23:16:32 +03:00
80bc9ed2ba
Add a gopher url port config option
...
This lets the user advertise a different port in the gopher urls,
for example listening locally on port 7070 but telling clients to
connect to the regular port 70.
2019-03-21 19:59:43 +03:00
b92a16aa00
Merge branch 'ecto-3-migration' into 'develop'
...
Ecto 3.0.7 (ecto_sql 3.0.5) migration
See merge request pleroma/pleroma!957
2019-03-21 16:24:57 +00:00
bf27190f7f
UtilController: Return state of safe dm mentions.
2019-03-21 16:20:58 +01:00
8468f3f6d4
Add safe dm mode option.
2019-03-20 21:09:36 +01:00
af68a42ef7
[ #923 ] Support for multiple OAuth consumer strategies.
2019-03-20 20:25:48 +03:00
19a19bdd81
Fix migration timestamp type
2019-03-20 16:04:59 +03:00
9a7b817c9a
Ecto 3.0.5 migration
...
kms
2019-03-20 15:59:54 +03:00
e17a9a1f66
[ #923 ] Nickname & email selection for external registrations, option to connect to existing account.
2019-03-20 10:35:31 +03:00
7ac9fff437
Format
2019-03-20 01:40:50 +03:00
ed8a2935f5
Use ILIKE to search users
2019-03-20 01:37:40 +03:00
1685e4258f
transmogrifier: upgrade: when upgrading OStatus users to AP, ensure we always use the fake collection
2019-03-19 18:39:33 +00:00
67ff8d9311
user: properly cope with actors which do not declare a followers collection
2019-03-19 18:23:06 +00:00
cd055983c3
transmogrifier: when determining followers collection URI, we may need to fetch the actor
2019-03-19 18:04:57 +00:00
d487b753c3
activitypub: transmogrifier: do not allow missing lists to be interpreted as nil
2019-03-19 17:30:25 +00:00
798da28812
activitypub: transmogrifier: ensure as:Public activities are delivered to followers
2019-03-19 17:27:42 +00:00
43bd7f47db
Merge branch 'feature/order-users-by-nickname-admin-api' into 'develop'
...
Order users by nickname
See merge request pleroma/pleroma!945
2019-03-18 23:08:31 +00:00
aba4c27120
Merge branch 'masto-api-notifications' into 'develop'
...
Add support for exclude_types, limit and min_id in Mastodon notifications
See merge request pleroma/pleroma!949
2019-03-18 19:17:36 +00:00
40e9a04c31
[ #923 ] Registration validations & unique index on [:user_id, :provider].
2019-03-18 20:31:24 +03:00
a1aacc08a4
Check if the user has indeed not been federated with
...
Just updating the user triggered post fetching too, now it
shouldn't. It only happened in the AP user fetching since that's
what's used to update users
2019-03-18 20:16:31 +03:00
8d21859717
[ #923 ] External User registration refactoring, password randomization.
2019-03-18 18:09:53 +03:00
97b35e00b0
Fix with expression always matching
2019-03-18 14:59:52 +00:00
e572786dad
Run
2019-03-18 14:53:30 +00:00
af4338da0c
Use better error message
2019-03-18 14:52:24 +00:00
26b6354095
[ #923 ] Support for multiple (external) registrations per user via Registration.
2019-03-18 17:23:38 +03:00
5ba14c664b
Fix missing end brace
2019-03-18 14:05:10 +00:00
a2e03d4f3c
Initial attempt at updating return type
2019-03-18 13:56:59 +00:00
1588688a11
Added support for exclude_types, limit, and min_id in Mastodon
...
notifications.
Unify Mastodon-compatible pagination logic.
2019-03-18 11:27:27 +03:00
2a96283efb
[ #923 ] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
...
# Conflicts:
# config/config.exs
# lib/pleroma/web/auth/pleroma_authenticator.ex
2019-03-18 10:26:41 +03:00
f6fab01ba7
Web.Router: Add routes for Conversation mastoAPI
2019-03-17 17:06:28 +01:00
4ed2618f6c
Allow 'rel' attribute on `<a>` link with specific values (for hashtag recognition).
2019-03-17 11:03:19 -04:00
93291c3d7a
Order users by nickname
2019-03-17 13:23:31 +03:00
6d6f48d079
Merge branch 'feature/federated-flags' into 'develop'
...
Federated reports
See merge request pleroma/pleroma!935
2019-03-16 19:27:56 +00:00
28df397454
Merge branch 'feature/oauth-me' into 'develop'
...
oauth: add me property to token responses
See merge request pleroma/pleroma!942
2019-03-16 08:44:02 +00:00
c69dc2acf1
Merge branch 'feature/reblog-muting' into 'develop'
...
Implement mastodon's reblog hiding feature
See merge request pleroma/pleroma!916
2019-03-16 04:31:31 +00:00
e0edc706cf
oauth: add me property to token responses
2019-03-16 01:12:50 +00:00
43fb03be5a
Allow to mark a single notification as read
2019-03-15 23:56:14 +03:00
4b3c86c1a6
Merge branch 'fix/mediaproxy-capture-content-disposition-filename' into 'develop'
...
MediaProxy: parse filename from content-disposition for non-whitelisted types
See merge request pleroma/pleroma!936
2019-03-15 20:06:08 +00:00
8b352af4dd
Merge branch 'feature/openldap-support' into 'develop'
...
OpenLDAP support
Closes #203
See merge request pleroma/pleroma!859
2019-03-15 19:57:09 +00:00
2739057442
Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
2019-03-15 17:11:00 +03:00
aacbf0f570
[ #923 ] OAuth: prototype of sign in / sign up with Twitter.
2019-03-15 17:08:03 +03:00
d8244c2a1b
remove unused function
2019-03-15 15:03:03 +01:00
dfeb3aec44
fix credo warning
2019-03-15 14:36:07 +01:00
094e1ef048
formatting
2019-03-15 14:28:14 +01:00
da53c079db
Refactor to store user ap_id, add tests
2019-03-15 14:20:08 +01:00
Ariadne Conill
Ivan Tashkinov
stwf
lain
Egor Kislitsyn
rinpatch
Haelwenn
Maksim
Sergey Suprunenko
Maxim Filippov
Thibaut Girka
Eugenij
Haelwenn (lanodan) Monnier
Alexander Strizhakov
feld
Roman Chvanikov
Sachin Joshi
Thomas Sileo
kPherox
Mike Verdone
sadposter
Mark Felder
RX14
Ivan Tashkinov
Moonman
kaniini
KokaKiwi
William Pitcock
Ivan Tashkinov
Roman Chvanikov
Roman Chvanikov
jeff
Aaron Tinio
Francis Dinh
AkiraFukushima
Ekaterina Vaartis
Hakurei Reimu
Roger Braun
href
cascode
Austin Lanari
Quentin Rameau
Zachary Dunn
Fong-Wan Chau
Karen Konou