rinpatch
264cb2c77f
Merge branch '2510-oauth-app-tokens-further-support' into 'develop'
...
[#2510 ] Improved support for app-bound OAuth tokens
Closes #2510
See merge request pleroma/pleroma!3316
2021-02-17 13:08:51 +00:00
rinpatch
d7ad288c84
Chats: Introduce /api/v2/pleroma/chats which implements pagination
...
Also removes incorrect claim that /api/v1/pleroma/chats supports
pagination and deprecates it.
Closes #2140
2021-02-17 16:03:24 +03:00
Ivan Tashkinov
854ea1aefb
[ #3213 ] Fixed HashtagsTableMigrator.count/1.
2021-02-17 09:23:35 +03:00
Ivan Tashkinov
111bfdd3a0
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
2021-02-16 23:23:49 +03:00
Ivan Tashkinov
938823c730
[ #3213 ] HashtagsTableMigrator state management refactoring & improvements (proper stats serialization etc.).
2021-02-16 23:14:15 +03:00
rinpatch
98ab2b82a6
ChatMessage schema: Add unread property
...
It is present in the code, but was not documented.
2021-02-16 22:41:06 +03:00
Ivan Tashkinov
1dac7d1462
[ #3213 ] Fixed hashtags.name lookup (must use citext type to do index scan). Fixed embedded hashtags lookup (lowercasing), adjusted tests.
2021-02-15 21:13:14 +03:00
Egor Kislitsyn
cf6d3db58f
Add API endpoint to remove a conversation
2021-02-15 21:48:13 +04:00
Ivan Tashkinov
284504f689
[ #2053 ] Changed Notification/for_user_query/2 to use join to filter out inactive actors instead of subselect of _all_ inactive AP ids from users.
2021-02-15 09:08:04 +03:00
Ivan Tashkinov
349b8b0f4f
[ #3213 ] rescue around potentially-raising Repo.insert_all/_ calls. Misc. improvements (docs etc.).
2021-02-13 22:01:11 +03:00
3554a65f45
Inject fake application metadata and validate it is stripped by transmogrifier
2021-02-12 13:05:12 -06:00
9b61df1fb6
App is already preloaded into the token, so avoid an extra query
2021-02-12 12:44:45 -06:00
c1d78328ee
Consistency
2021-02-11 14:27:52 -06:00
6dc0b13cf8
Revert to original formatting for these function defs
2021-02-11 14:24:51 -06:00
7c508319a5
Prefer naming this put_application because we're putting it into the params map
2021-02-11 14:19:53 -06:00
09b8378646
%Token{} may not be in the conn, so avoid breaking the ability to post statuses in that scenario.
2021-02-11 14:15:25 -06:00
Ivan Tashkinov
5992382cf8
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
...
# Conflicts:
# CHANGELOG.md
# lib/mix/tasks/pleroma/database.ex
# lib/pleroma/web/templates/feed/feed/_activity.rss.eex
2021-02-11 19:31:57 +03:00
Ivan Tashkinov
a996ab46a5
[ #3213 ] Reorganized hashtags cleanup. Transaction-wrapped Hashtag.get_or_create_by_names/1. Misc. improvements.
2021-02-11 19:30:21 +03:00
Ivan Tashkinov
df89b5019b
[ #2510 ] Improved support for app-bound OAuth tokens. Auth-related refactoring.
2021-02-11 15:02:50 +03:00
Haelwenn
2cf753c502
Merge branch 'fix/no-version-api-pleroma-social' into 'develop'
...
Fix no version number on api.pleroma.social
See merge request pleroma/pleroma!3310
2021-02-10 00:52:59 +00:00
4540e08a6a
Rendering fallback for when we don't have valid data available
2021-02-09 18:52:22 -06:00
981349f21d
Enable rendering of the client application data details
2021-02-09 18:22:41 -06:00
3dc7e89c54
Ensure we capture the application details into the object
2021-02-09 18:07:15 -06:00
de8b8e9cf1
Add a function to lookup client app details by the app_id
2021-02-09 16:59:58 -06:00
rinpatch
a853218701
Merge branch 'features/ap_id-c2s-authentication' into 'develop'
...
activity_pub_controller: Add authentication to object & activity endpoints
See merge request pleroma/pleroma!3295
2021-02-09 19:29:43 +00:00
rinpatch
0d9230aed9
OpenAPI spec: Do not show build enviroment in the spec version
2021-02-09 22:23:11 +03:00
rinpatch
f13f5d9303
OpenAPI spec task: Load pleroma application to get version info
...
For whatever reason it seems to pick up the version without loading the
app on my machine, but not on the CI.
2021-02-09 22:10:09 +03:00
4cacce4b42
Revert "Add plaintext support for all emails except the digest"
...
This reverts commit 5df9f68392
2021-02-08 16:39:55 -06:00
593c0851d9
Merge branch 'develop' into 'new-user-emails'
2021-02-08 16:01:50 -06:00
Haelwenn
a5bee1bf35
Merge branch 'feat/mrf-noemptypolicy' into 'develop'
...
MRF NoEmptyPolicy: Deny posts from local users if there is no content or only mentions.
See merge request pleroma/pleroma!3309
2021-02-08 21:49:20 +00:00
55a13fc360
MRF NoEmptyPolicy: Deny posts from local users if there is no content or only mentions.
...
Helps prevent accidental button mashes from submitting incomplete posts
2021-02-08 15:32:47 -06:00
rinpatch
17f41a589f
Merge branch 'fix/rss-link' into 'develop'
...
RSS: Make sure post URL is the first `<link>` element
See merge request pleroma/pleroma!3308
2021-02-08 20:14:53 +00:00
rinpatch
ed8ef80b5e
RSS: Make sure post URL is the first <link> element
...
Otherwise some RSS readers (tested in Miniflux) might pick the context
URL as the external link.
Related to #2425 .
2021-02-08 22:44:15 +03:00
Haelwenn (lanodan) Monnier
8c7b3b20d8
activity_pub_controller: Add authentication to object & activity endpoints
2021-02-08 20:00:47 +01:00
rinpatch
8babd796da
Merge branch 'fix/reports-from-admins' into 'develop'
...
Suppress report notification for admin actors
See merge request pleroma/pleroma!3301
2021-02-08 10:31:20 +00:00
Ivan Tashkinov
d1c6dd97aa
[ #3213 ] Partially addressed code review points.
...
migration rollback task changes, hashtags-related config handling tweaks, `hashtags.data` deletion (unused).
2021-02-07 22:24:12 +03:00
rinpatch
6e68058b63
Merge branch 'feat/allow_alt_text_search_config' into 'develop'
...
allow user defined text search config in database
See merge request pleroma/pleroma!3275
2021-02-06 09:42:20 +00:00
hyperion
8d4e0342e1
Update priv/repo/migrations/20190501125843_add_fts_index_to_objects.exs, priv/repo/optional_migrations/rum_indexing/20190510135645_add_fts_index_to_objects_two.exs files
2021-02-06 09:42:17 +00:00
0368419fce
Slightly better formatting
2021-02-05 09:13:53 -06:00
5df9f68392
Add plaintext support for all emails except the digest
2021-02-05 09:13:17 -06:00
95930a7aa5
Actually send the mail
2021-02-04 17:42:09 -06:00
e945ccc91b
Add a registration email that only sends if no other emails (welcome, approval, confirmation) are enabled
2021-02-04 15:16:50 -06:00
2956c21a55
Improve confirmation email language
2021-02-04 15:10:43 -06:00
af37a5c51a
Also make this maybe_ for consistency
2021-02-04 14:33:49 -06:00
b22b12f738
These welcome emails are not guaranteed and can be private functions
2021-02-04 14:01:15 -06:00
d047372291
Merge branch 'develop' into fix/reports-from-admins
2021-02-04 12:37:20 -06:00
bf9cd4a0e2
Standardize the way we capture and use Mix.env()
2021-02-04 10:13:03 -06:00
7b67bf4e97
Merge branch 'fix/configdb-error' into 'develop'
...
Improve error message for ConfigDB
See merge request pleroma/pleroma!3289
2021-02-04 14:33:59 +00:00
Haelwenn
ea5469961a
Merge branch 'bugfix/notice-external-redirect' into 'develop'
...
Redirect non-local activities when /notice/:id is used
See merge request pleroma/pleroma!3300
2021-02-04 14:26:03 +00:00
Haelwenn (lanodan) Monnier
ecff027418
Redirect non-local activities when /notice/:id is used
...
Related-to: https://git.pleroma.social/pleroma/pleroma/-/issues/2496
2021-02-04 15:17:40 +01:00
887db076b5
Load an emoji.txt specific to the test env
2021-02-03 16:40:59 -06:00
76f732766b
Exclude reporter from receiving notifications from their own reports.
...
Currently only works if the reporting actor is an admin, but if we include
moderators with those who receive notification reports it will work for them.
2021-02-03 12:32:44 -06:00
rinpatch
74ef1a044d
Account schema: specify that pleroma.relationship is nullable
2021-02-03 18:10:43 +03:00
008499f65a
Merge branch 'develop' into 'fix/2412-filters'
...
# Conflicts:
# CHANGELOG.md
2021-02-03 14:23:23 +00:00
c3dd860a02
Merge branch 'fix/2449-scheduled-poll-bug' into 'develop'
...
Fix for scheduled post with poll
Closes #2449
See merge request pleroma/pleroma!3294
2021-02-03 14:22:23 +00:00
8d2ea95402
Merge branch 'feature/2438-users-posts-total-count' into 'develop'
...
Feature/2438 users/instances posts total count
Closes #2438
See merge request pleroma/pleroma!3270
2021-02-03 14:21:57 +00:00
rinpatch
e2d7c4fd57
Merge branch 'feat/openapi-spec-export' into 'develop'
...
Improve OpenAPI spec and deploy it to api.pleroma.social
See merge request pleroma/pleroma!3296
2021-02-03 13:21:19 +00:00
rinpatch
9fcff7851f
Improve OpenAPI spec and deploy it to api.pleroma.social
...
Too many changes in OpenAPI spec to describe each one, but
basically it is tag fixes, bringing consitency to operation summaries
and fixing some incorrect information.
2021-02-03 16:07:44 +03:00
Ivan Tashkinov
4e14945670
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
...
# Conflicts:
# CHANGELOG.md
# lib/pleroma/web/activity_pub/activity_pub.ex
2021-02-03 09:31:38 +03:00
fd2477dfba
Merge branch 'a1batross-develop-patch-62810' into 'develop'
...
mix: instance: ensure all needed folders are created before generating config
See merge request pleroma/pleroma!3284
2021-02-02 18:37:20 +00:00
f1f773f2c7
Merge branch 'email-stub-in-verify-credentials' into 'develop'
...
Email-like field in /api/v1/accounts/verify_credentials (for PeerTube OAuth plugin and alike)
See merge request pleroma/pleroma!3286
2021-02-02 18:35:08 +00:00
d0b4a49f16
Merge branch 'develop' into a1batross-develop-patch-62810
2021-02-02 12:18:03 -06:00
c118bdb8f0
Merge branch 'develop' into a1batross-develop-patch-62810
2021-02-02 12:16:49 -06:00
d289ad8579
Merge branch 'develop' into 'fix/2411-mutes-api'
...
# Conflicts:
# CHANGELOG.md
# docs/development/API/differences_in_mastoapi_responses.md
2021-02-02 17:57:58 +00:00
6a2d3fb9a3
Merge branch 'fix/2473-purge-expired-activities-duplicates' into 'develop'
...
fix and delete purge activities duplicates
Closes #2473
See merge request pleroma/pleroma!3285
2021-02-02 17:22:23 +00:00
cd5ff7a943
Merge branch 'develop' into 'feature/2164-unify-api-arguments'
...
# Conflicts:
# CHANGELOG.md
2021-02-02 17:11:38 +00:00
2012800ed1
Merge branch 'fix/attachment-cleanup' into 'develop'
...
Only run attachment cleanup if enabled
See merge request pleroma/pleroma!3288
2021-02-02 17:08:33 +00:00
69c560cfba
Merge branch 'active-user-count' into 'develop'
...
Monthly Active Users
Closes #2332
See merge request pleroma/pleroma!3283
2021-02-02 17:07:57 +00:00
Alexander Strizhakov
0dc68c157f
fix for scheduled post with poll
2021-02-01 18:22:26 +03:00
Alexander Strizhakov
fdf1dfed56
only_remote -> remote renaming
2021-02-01 14:11:12 +03:00
Alexander Strizhakov
ba512cbea4
/api/v1/accounts/:id/statuses docs update
2021-02-01 14:11:12 +03:00
Alexander Strizhakov
77f0a0af7d
more tests and update for docs and changelog
2021-02-01 14:11:12 +03:00
Alexander Strizhakov
2cb6dc5a3a
list timeline filtration by params
2021-02-01 14:11:12 +03:00
Alexander Strizhakov
b6a72680e2
added only_media flag to home timeline
2021-02-01 14:11:11 +03:00
Alexander Strizhakov
c3110c46f3
expanding filtration for home timeline
...
added local & remote statuses filtration for home timeline
2021-02-01 14:11:11 +03:00
Ivan Tashkinov
cf4765af40
[ #3213 ] ActivityPub: fixed subquery-based hashtags filtering implementation (addressed empty list options issue). Added regression test.
2021-01-31 23:06:38 +03:00
Ivan Tashkinov
10207f840c
[ #3213 ] ActivityPub: temporarily reverted to previous hashtags filtering implementation due to blank results issue.
2021-01-31 22:36:46 +03:00
Ivan Tashkinov
108e90b18e
[ #3213 ] Explicitly defined PKs in hashtags_objects and data_migration_failed_ids. Added "pleroma.database rollback" task to revert a single migration.
2021-01-31 22:03:59 +03:00
Ivan Tashkinov
1b49b8efe5
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
...
# Conflicts:
# CHANGELOG.md
2021-01-31 20:38:58 +03:00
Ivan Tashkinov
6fd4163ab6
[ #3213 ] ActivityPub: implemented subqueries-based hashtags filtering, removed aggregation-based hashtags filtering.
2021-01-31 20:37:33 +03:00
Ivan Tashkinov
9948ff3356
[ #3213 ] Added HashtagsCleanupWorker periodic job.
2021-01-31 18:24:19 +03:00
Alexander Strizhakov
b794dae98a
like this
2021-01-29 15:55:00 +03:00
Alexander Strizhakov
c369d2b930
support for with_relationships parameter
...
in /api/v1/mutes and /api/v1/accounts/:id endpoints
2021-01-29 08:41:21 +03:00
Ivan Tashkinov
380d0cce6b
[ #3213 ] Reinstated DISTINCT clause for hashtag "any" filtering with 2+ terms. Added test.
2021-01-29 00:17:33 +03:00
5fcab23aa3
Improve error message for ConfigDB
2021-01-28 14:59:23 -06:00
13d79c281f
Make attachment cleanup jobs a noop if the setting is disabled.
2021-01-28 14:42:20 -06:00
Egor Kislitsyn
a51d903e0c
Make sure active_user_count/1 counts only local users
2021-01-28 22:23:10 +04:00
Ivan Tashkinov
60b4654038
Email-like field in /api/v1/accounts/verify_credentials response (for OAuth plugins like Peertube).
...
Addresses https://git.pleroma.social/pleroma/pleroma-support/-/issues/56 .
2021-01-28 19:49:43 +03:00
Alexander Strizhakov
6c987c7670
fix and delete purge activities duplicates
2021-01-28 16:57:41 +03:00
Alexander Strizhakov
39335d4251
fix for unique oban worker option
2021-01-28 16:57:03 +03:00
aaceb042c5
fix format
2021-01-28 10:20:25 +00:00
1547a2fda4
mix: instance: ensure all needed folders are created before generating config
2021-01-28 09:39:53 +00:00
Alexander Strizhakov
35cad9793d
cache headers for emoji and images
2021-01-27 18:49:08 +03:00
Egor Kislitsyn
793fc77b16
Add active user count
2021-01-27 18:20:06 +04:00
Alexander Strizhakov
d4158e8bf0
added total
...
to the instance adminAPI endpoint
2021-01-27 07:45:06 +03:00
Alexander Strizhakov
6806c03e85
added total
...
to the user statuses adminAPI endpoint
2021-01-27 07:45:02 +03:00
d7af0294e6
Merge branch 'service-worker-allowed-header' into 'develop'
...
Ability to set custom HTTP headers per each frontend
See merge request pleroma/pleroma!3247
2021-01-26 18:14:01 +00:00
lain
229acae6c3
Merge branch 'develop' into '2435-list-multiple-users'
...
# Conflicts:
# CHANGELOG.md
2021-01-26 14:24:32 +00:00
Alexander Strizhakov
875fbaae35
support for expires_in/expires_at in filters
2021-01-26 08:27:45 +03:00
Haelwenn
250e202098
Merge branch 'fix/missing-own_votes' into 'develop'
...
Include own_votes in the poll data
See merge request pleroma/pleroma!3274
2021-01-26 00:55:05 +00:00
