mirror of
https://git.pleroma.social/pleroma/pleroma.git
synced 2024-12-23 08:36:29 +00:00
Merge branch 'develop' into issue/1383
This commit is contained in:
commit
2b821036c4
37 changed files with 926 additions and 409 deletions
|
@ -1,3 +1,3 @@
|
||||||
[
|
[
|
||||||
inputs: ["mix.exs", "{config,lib,test}/**/*.{ex,exs}", "priv/repo/migrations/*.exs"]
|
inputs: ["mix.exs", "{config,lib,test}/**/*.{ex,exs}", "priv/repo/migrations/*.exs", "priv/scrubbers/*.ex"]
|
||||||
]
|
]
|
||||||
|
|
|
@ -48,6 +48,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
|
||||||
- Mix task to list all users (`mix pleroma.user list`)
|
- Mix task to list all users (`mix pleroma.user list`)
|
||||||
- Support for `X-Forwarded-For` and similar HTTP headers which used by reverse proxies to pass a real user IP address to the backend. Must not be enabled unless your instance is behind at least one reverse proxy (such as Nginx, Apache HTTPD or Varnish Cache).
|
- Support for `X-Forwarded-For` and similar HTTP headers which used by reverse proxies to pass a real user IP address to the backend. Must not be enabled unless your instance is behind at least one reverse proxy (such as Nginx, Apache HTTPD or Varnish Cache).
|
||||||
- MRF: New module which handles incoming posts based on their age. By default, all incoming posts that are older than 2 days will be unlisted and not shown to their followers.
|
- MRF: New module which handles incoming posts based on their age. By default, all incoming posts that are older than 2 days will be unlisted and not shown to their followers.
|
||||||
|
- User notification settings: Add `privacy_option` option.
|
||||||
<details>
|
<details>
|
||||||
<summary>API Changes</summary>
|
<summary>API Changes</summary>
|
||||||
|
|
||||||
|
@ -82,6 +83,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
|
||||||
- Report emails now include functional links to profiles of remote user accounts
|
- Report emails now include functional links to profiles of remote user accounts
|
||||||
- Not being able to log in to some third-party apps when logged in to MastoFE
|
- Not being able to log in to some third-party apps when logged in to MastoFE
|
||||||
- MRF: `Delete` activities being exempt from MRF policies
|
- MRF: `Delete` activities being exempt from MRF policies
|
||||||
|
- OTP releases: Not being able to configure OAuth expired token cleanup interval
|
||||||
|
- OTP releases: Not being able to configure HTML sanitization policy
|
||||||
<details>
|
<details>
|
||||||
<summary>API Changes</summary>
|
<summary>API Changes</summary>
|
||||||
|
|
||||||
|
|
|
@ -103,6 +103,7 @@ The `type` value is `move`. Has an additional field:
|
||||||
Accepts additional parameters:
|
Accepts additional parameters:
|
||||||
|
|
||||||
- `exclude_visibilities`: will exclude the notifications for activities with the given visibilities. The parameter accepts an array of visibility types (`public`, `unlisted`, `private`, `direct`). Usage example: `GET /api/v1/notifications?exclude_visibilities[]=direct&exclude_visibilities[]=private`.
|
- `exclude_visibilities`: will exclude the notifications for activities with the given visibilities. The parameter accepts an array of visibility types (`public`, `unlisted`, `private`, `direct`). Usage example: `GET /api/v1/notifications?exclude_visibilities[]=direct&exclude_visibilities[]=private`.
|
||||||
|
- `with_move`: boolean, when set to `true` will include Move notifications. `false` by default.
|
||||||
|
|
||||||
## POST `/api/v1/statuses`
|
## POST `/api/v1/statuses`
|
||||||
|
|
||||||
|
|
|
@ -302,6 +302,7 @@ See [Admin-API](admin_api.md)
|
||||||
* `follows`: BOOLEAN field, receives notifications from people the user follows
|
* `follows`: BOOLEAN field, receives notifications from people the user follows
|
||||||
* `remote`: BOOLEAN field, receives notifications from people on remote instances
|
* `remote`: BOOLEAN field, receives notifications from people on remote instances
|
||||||
* `local`: BOOLEAN field, receives notifications from people on the local instance
|
* `local`: BOOLEAN field, receives notifications from people on the local instance
|
||||||
|
* `privacy_option`: BOOLEAN field. When set to true, it removes the contents of a message from the push notification.
|
||||||
* Response: JSON. Returns `{"status": "success"}` if the update was successful, otherwise returns `{"error": "error_msg"}`
|
* Response: JSON. Returns `{"status": "success"}` if the update was successful, otherwise returns `{"error": "error_msg"}`
|
||||||
|
|
||||||
## `/api/pleroma/healthcheck`
|
## `/api/pleroma/healthcheck`
|
||||||
|
|
|
@ -3,17 +3,26 @@
|
||||||
!!! danger
|
!!! danger
|
||||||
This is a Work In Progress, not usable just yet.
|
This is a Work In Progress, not usable just yet.
|
||||||
|
|
||||||
Every command should be ran with a prefix, in case of OTP releases it is `./bin/pleroma_ctl config` and in case of source installs it's
|
{! backend/administration/CLI_tasks/general_cli_task_info.include !}
|
||||||
`mix pleroma.config`.
|
|
||||||
|
|
||||||
## Transfer config from file to DB.
|
## Transfer config from file to DB.
|
||||||
|
|
||||||
```sh
|
```sh tab="OTP"
|
||||||
$PREFIX migrate_to_db
|
./bin/pleroma_ctl config migrate_to_db
|
||||||
```
|
```
|
||||||
|
|
||||||
|
```sh tab="From Source"
|
||||||
|
mix pleroma.config migrate_to_db
|
||||||
|
```
|
||||||
|
|
||||||
|
|
||||||
## Transfer config from DB to `config/env.exported_from_db.secret.exs`
|
## Transfer config from DB to `config/env.exported_from_db.secret.exs`
|
||||||
|
|
||||||
```sh
|
```sh tab="OTP"
|
||||||
$PREFIX migrate_from_db <env>
|
./bin/pleroma_ctl config migrate_from_db <env>
|
||||||
```
|
```
|
||||||
|
|
||||||
|
```sh tab="From Source"
|
||||||
|
mix pleroma.config migrate_from_db <env>
|
||||||
|
```
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
# Database maintenance tasks
|
# Database maintenance tasks
|
||||||
|
|
||||||
Every command should be ran with a prefix, in case of OTP releases it is `./bin/pleroma_ctl database` and in case of source installs it's `mix pleroma.database`.
|
{! backend/administration/CLI_tasks/general_cli_task_info.include !}
|
||||||
|
|
||||||
!!! danger
|
!!! danger
|
||||||
These mix tasks can take a long time to complete. Many of them were written to address specific database issues that happened because of bugs in migrations or other specific scenarios. Do not run these tasks "just in case" if everything is fine your instance.
|
These mix tasks can take a long time to complete. Many of them were written to address specific database issues that happened because of bugs in migrations or other specific scenarios. Do not run these tasks "just in case" if everything is fine your instance.
|
||||||
|
@ -9,8 +9,12 @@ Every command should be ran with a prefix, in case of OTP releases it is `./bin/
|
||||||
|
|
||||||
Replaces embedded objects with references to them in the `objects` table. Only needs to be ran once if the instance was created before Pleroma 1.0.5. The reason why this is not a migration is because it could significantly increase the database size after being ran, however after this `VACUUM FULL` will be able to reclaim about 20% (really depends on what is in the database, your mileage may vary) of the db size before the migration.
|
Replaces embedded objects with references to them in the `objects` table. Only needs to be ran once if the instance was created before Pleroma 1.0.5. The reason why this is not a migration is because it could significantly increase the database size after being ran, however after this `VACUUM FULL` will be able to reclaim about 20% (really depends on what is in the database, your mileage may vary) of the db size before the migration.
|
||||||
|
|
||||||
```sh
|
```sh tab="OTP"
|
||||||
$PREFIX remove_embedded_objects [<options>]
|
./bin/pleroma_ctl database remove_embedded_objects [<options>]
|
||||||
|
```
|
||||||
|
|
||||||
|
```sh tab="From Source"
|
||||||
|
mix pleroma.database remove_embedded_objects [<options>]
|
||||||
```
|
```
|
||||||
|
|
||||||
### Options
|
### Options
|
||||||
|
@ -20,11 +24,15 @@ $PREFIX remove_embedded_objects [<options>]
|
||||||
|
|
||||||
This will prune remote posts older than 90 days (configurable with [`config :pleroma, :instance, remote_post_retention_days`](../../configuration/cheatsheet.md#instance)) from the database, they will be refetched from source when accessed.
|
This will prune remote posts older than 90 days (configurable with [`config :pleroma, :instance, remote_post_retention_days`](../../configuration/cheatsheet.md#instance)) from the database, they will be refetched from source when accessed.
|
||||||
|
|
||||||
!!! note
|
!!! danger
|
||||||
The disk space will only be reclaimed after `VACUUM FULL`
|
The disk space will only be reclaimed after `VACUUM FULL`. You may run out of disk space during the execution of the task or vacuuming if you don't have about 1/3rds of the database size free.
|
||||||
|
|
||||||
```sh
|
```sh tab="OTP"
|
||||||
$PREFIX pleroma.database prune_objects [<options>]
|
./bin/pleroma_ctl database prune_objects [<options>]
|
||||||
|
```
|
||||||
|
|
||||||
|
```sh tab="From Source"
|
||||||
|
mix pleroma.database prune_objects [<options>]
|
||||||
```
|
```
|
||||||
|
|
||||||
### Options
|
### Options
|
||||||
|
@ -34,18 +42,30 @@ $PREFIX pleroma.database prune_objects [<options>]
|
||||||
|
|
||||||
Can be safely re-run
|
Can be safely re-run
|
||||||
|
|
||||||
```sh
|
```sh tab="OTP"
|
||||||
$PREFIX bump_all_conversations
|
./bin/pleroma_ctl database bump_all_conversations
|
||||||
|
```
|
||||||
|
|
||||||
|
```sh tab="From Source"
|
||||||
|
mix pleroma.database bump_all_conversations
|
||||||
```
|
```
|
||||||
|
|
||||||
## Remove duplicated items from following and update followers count for all users
|
## Remove duplicated items from following and update followers count for all users
|
||||||
|
|
||||||
```sh
|
```sh tab="OTP"
|
||||||
$PREFIX update_users_following_followers_counts
|
./bin/pleroma_ctl database update_users_following_followers_counts
|
||||||
|
```
|
||||||
|
|
||||||
|
```sh tab="From Source"
|
||||||
|
mix pleroma.database update_users_following_followers_counts
|
||||||
```
|
```
|
||||||
|
|
||||||
## Fix the pre-existing "likes" collections for all objects
|
## Fix the pre-existing "likes" collections for all objects
|
||||||
|
|
||||||
```sh
|
```sh tab="OTP"
|
||||||
$PREFIX fix_likes_collections
|
./bin/pleroma_ctl database fix_likes_collections
|
||||||
|
```
|
||||||
|
|
||||||
|
```sh tab="From Source"
|
||||||
|
mix pleroma.database fix_likes_collections
|
||||||
```
|
```
|
||||||
|
|
|
@ -1,13 +1,24 @@
|
||||||
# Managing digest emails
|
# Managing digest emails
|
||||||
Every command should be ran with a prefix, in case of OTP releases it is `./bin/pleroma_ctl digest` and in case of source installs it's `mix pleroma.digest`.
|
|
||||||
|
{! backend/administration/CLI_tasks/general_cli_task_info.include !}
|
||||||
|
|
||||||
## Send digest email since given date (user registration date by default) ignoring user activity status.
|
## Send digest email since given date (user registration date by default) ignoring user activity status.
|
||||||
|
|
||||||
```sh
|
```sh tab="OTP"
|
||||||
$PREFIX test <nickname> [<since_date>]
|
./bin/pleroma_ctl digest test <nickname> [<since_date>]
|
||||||
```
|
```
|
||||||
|
|
||||||
Example:
|
```sh tab="From Source"
|
||||||
```sh
|
mix pleroma.digest test <nickname> [<since_date>]
|
||||||
$PREFIX test donaldtheduck 2019-05-20
|
|
||||||
```
|
```
|
||||||
|
|
||||||
|
|
||||||
|
Example:
|
||||||
|
```sh tab="OTP"
|
||||||
|
./bin/pleroma_ctl digest test donaldtheduck 2019-05-20
|
||||||
|
```
|
||||||
|
|
||||||
|
```sh tab="From Source"
|
||||||
|
mix pleroma.digest test donaldtheduck 2019-05-20
|
||||||
|
```
|
||||||
|
|
||||||
|
|
|
@ -1,28 +1,44 @@
|
||||||
# Managing emoji packs
|
# Managing emoji packs
|
||||||
|
|
||||||
Every command should be ran with a prefix, in case of OTP releases it is `./bin/pleroma_ctl emoji` and in case of source installs it's `mix pleroma.emoji`.
|
{! backend/administration/CLI_tasks/general_cli_task_info.include !}
|
||||||
|
|
||||||
## Lists emoji packs and metadata specified in the manifest
|
## Lists emoji packs and metadata specified in the manifest
|
||||||
|
|
||||||
```sh
|
```sh tab="OTP"
|
||||||
$PREFIX ls-packs [<options>]
|
./bin/pleroma_ctl emoji ls-packs [<options>]
|
||||||
```
|
```
|
||||||
|
|
||||||
|
```sh tab="From Source"
|
||||||
|
mix pleroma.emoji ls-packs [<options>]
|
||||||
|
```
|
||||||
|
|
||||||
|
|
||||||
### Options
|
### Options
|
||||||
- `-m, --manifest PATH/URL` - path to a custom manifest, it can either be an URL starting with `http`, in that case the manifest will be fetched from that address, or a local path
|
- `-m, --manifest PATH/URL` - path to a custom manifest, it can either be an URL starting with `http`, in that case the manifest will be fetched from that address, or a local path
|
||||||
|
|
||||||
## Fetch, verify and install the specified packs from the manifest into `STATIC-DIR/emoji/PACK-NAME`
|
## Fetch, verify and install the specified packs from the manifest into `STATIC-DIR/emoji/PACK-NAME`
|
||||||
```sh
|
|
||||||
$PREFIX get-packs [<options>] <packs>
|
```sh tab="OTP"
|
||||||
|
./bin/pleroma_ctl emoji get-packs [<options>] <packs>
|
||||||
|
```
|
||||||
|
|
||||||
|
```sh tab="From Source"
|
||||||
|
mix pleroma.emoji get-packs [<options>] <packs>
|
||||||
```
|
```
|
||||||
|
|
||||||
### Options
|
### Options
|
||||||
- `-m, --manifest PATH/URL` - same as [`ls-packs`](#ls-packs)
|
- `-m, --manifest PATH/URL` - same as [`ls-packs`](#ls-packs)
|
||||||
|
|
||||||
## Create a new manifest entry and a file list from the specified remote pack file
|
## Create a new manifest entry and a file list from the specified remote pack file
|
||||||
```sh
|
|
||||||
$PREFIX gen-pack PACK-URL
|
```sh tab="OTP"
|
||||||
|
./bin/pleroma_ctl emoji gen-pack PACK-URL
|
||||||
```
|
```
|
||||||
|
|
||||||
|
```sh tab="From Source"
|
||||||
|
mix pleroma.emoji gen-pack PACK-URL
|
||||||
|
```
|
||||||
|
|
||||||
Currently, only .zip archives are recognized as remote pack files and packs are therefore assumed to be zip archives. This command is intended to run interactively and will first ask you some basic questions about the pack, then download the remote file and generate an SHA256 checksum for it, then generate an emoji file list for you.
|
Currently, only .zip archives are recognized as remote pack files and packs are therefore assumed to be zip archives. This command is intended to run interactively and will first ask you some basic questions about the pack, then download the remote file and generate an SHA256 checksum for it, then generate an emoji file list for you.
|
||||||
|
|
||||||
The manifest entry will either be written to a newly created `index.json` file or appended to the existing one, *replacing* the old pack with the same name if it was in the file previously.
|
The manifest entry will either be written to a newly created `index.json` file or appended to the existing one, *replacing* the old pack with the same name if it was in the file previously.
|
||||||
|
|
|
@ -0,0 +1,5 @@
|
||||||
|
Every command should be ran as the `pleroma` user from it's home directory. For example if you are superuser, you would have to wrap the command in `su pleroma -s $SHELL -lc "$COMMAND"`.
|
||||||
|
|
||||||
|
??? note "From source note about `MIX_ENV`"
|
||||||
|
|
||||||
|
The `mix` command should be prefixed with the name of environment your Pleroma server is running in, usually it's `MIX_ENV=prod`
|
|
@ -1,12 +1,17 @@
|
||||||
# Managing instance configuration
|
# Managing instance configuration
|
||||||
|
|
||||||
Every command should be ran with a prefix, in case of OTP releases it is `./bin/pleroma_ctl instance` and in case of source installs it's `mix pleroma.instance`.
|
{! backend/administration/CLI_tasks/general_cli_task_info.include !}
|
||||||
|
|
||||||
## Generate a new configuration file
|
## Generate a new configuration file
|
||||||
```sh
|
```sh tab="OTP"
|
||||||
$PREFIX gen [<options>]
|
./bin/pleroma_ctl instance gen [<options>]
|
||||||
```
|
```
|
||||||
|
|
||||||
|
```sh tab="From Source"
|
||||||
|
mix pleroma.instance gen [<options>]
|
||||||
|
```
|
||||||
|
|
||||||
|
|
||||||
If any of the options are left unspecified, you will be prompted interactively.
|
If any of the options are left unspecified, you will be prompted interactively.
|
||||||
|
|
||||||
### Options
|
### Options
|
||||||
|
|
|
@ -1,30 +1,33 @@
|
||||||
# Managing relays
|
# Managing relays
|
||||||
|
|
||||||
Every command should be ran with a prefix, in case of OTP releases it is `./bin/pleroma_ctl relay` and in case of source installs it's `mix pleroma.relay`.
|
{! backend/administration/CLI_tasks/general_cli_task_info.include !}
|
||||||
|
|
||||||
## Follow a relay
|
## Follow a relay
|
||||||
```sh
|
|
||||||
$PREFIX follow <relay_url>
|
```sh tab="OTP"
|
||||||
|
./bin/pleroma_ctl relay follow <relay_url>
|
||||||
```
|
```
|
||||||
|
|
||||||
Example:
|
```sh tab="From Source"
|
||||||
```sh
|
mix pleroma.relay follow <relay_url>
|
||||||
$PREFIX follow https://example.org/relay
|
|
||||||
```
|
```
|
||||||
|
|
||||||
## Unfollow a remote relay
|
## Unfollow a remote relay
|
||||||
|
|
||||||
```sh
|
```sh tab="OTP"
|
||||||
$PREFIX unfollow <relay_url>
|
./bin/pleroma_ctl relay unfollow <relay_url>
|
||||||
```
|
```
|
||||||
|
|
||||||
Example:
|
```sh tab="From Source"
|
||||||
```sh
|
mix pleroma.relay unfollow <relay_url>
|
||||||
$PREFIX unfollow https://example.org/relay
|
|
||||||
```
|
```
|
||||||
|
|
||||||
## List relay subscriptions
|
## List relay subscriptions
|
||||||
|
|
||||||
```sh
|
```sh tab="OTP"
|
||||||
$PREFIX list
|
./bin/pleroma_ctl relay list
|
||||||
|
```
|
||||||
|
|
||||||
|
```sh tab="From Source"
|
||||||
|
mix pleroma.relay list
|
||||||
```
|
```
|
||||||
|
|
|
@ -1,11 +1,16 @@
|
||||||
# Managing uploads
|
# Managing uploads
|
||||||
|
|
||||||
Every command should be ran with a prefix, in case of OTP releases it is `./bin/pleroma_ctl uploads` and in case of source installs it's `mix pleroma.uploads`.
|
{! backend/administration/CLI_tasks/general_cli_task_info.include !}
|
||||||
|
|
||||||
## Migrate uploads from local to remote storage
|
## Migrate uploads from local to remote storage
|
||||||
```sh
|
```sh tab="OTP"
|
||||||
$PREFIX migrate_local <target_uploader> [<options>]
|
./bin/pleroma_ctl uploads migrate_local <target_uploader> [<options>]
|
||||||
```
|
```
|
||||||
|
|
||||||
|
```sh tab="From Source"
|
||||||
|
mix pleroma.uploads migrate_local <target_uploader> [<options>]
|
||||||
|
```
|
||||||
|
|
||||||
### Options
|
### Options
|
||||||
- `--delete` - delete local uploads after migrating them to the target uploader
|
- `--delete` - delete local uploads after migrating them to the target uploader
|
||||||
|
|
||||||
|
|
|
@ -1,12 +1,18 @@
|
||||||
# Managing users
|
# Managing users
|
||||||
|
|
||||||
Every command should be ran with a prefix, in case of OTP releases it is `./bin/pleroma_ctl user` and in case of source installs it's `mix pleroma.user`.
|
{! backend/administration/CLI_tasks/general_cli_task_info.include !}
|
||||||
|
|
||||||
## Create a user
|
## Create a user
|
||||||
```sh
|
|
||||||
$PREFIX new <nickname> <email> [<options>]
|
```sh tab="OTP"
|
||||||
|
./bin/pleroma_ctl user new <email> [<options>]
|
||||||
```
|
```
|
||||||
|
|
||||||
|
```sh tab="From Source"
|
||||||
|
mix pleroma.user new <email> [<options>]
|
||||||
|
```
|
||||||
|
|
||||||
|
|
||||||
### Options
|
### Options
|
||||||
- `--name <name>` - the user's display name
|
- `--name <name>` - the user's display name
|
||||||
- `--bio <bio>` - the user's bio
|
- `--bio <bio>` - the user's bio
|
||||||
|
@ -16,84 +22,159 @@ $PREFIX new <nickname> <email> [<options>]
|
||||||
- `-y`, `--assume-yes`/`--no-assume-yes` - whether to assume yes to all questions
|
- `-y`, `--assume-yes`/`--no-assume-yes` - whether to assume yes to all questions
|
||||||
|
|
||||||
## List local users
|
## List local users
|
||||||
```sh
|
```sh tab="OTP"
|
||||||
$PREFIX list
|
./bin/pleroma_ctl user list
|
||||||
```
|
```
|
||||||
|
|
||||||
## Generate an invite link
|
```sh tab="From Source"
|
||||||
```sh
|
mix pleroma.user list
|
||||||
$PREFIX invite [<options>]
|
|
||||||
```
|
```
|
||||||
|
|
||||||
|
|
||||||
|
## Generate an invite link
|
||||||
|
```sh tab="OTP"
|
||||||
|
./bin/pleroma_ctl user invite [<options>]
|
||||||
|
```
|
||||||
|
|
||||||
|
```sh tab="From Source"
|
||||||
|
mix pleroma.user invite [<options>]
|
||||||
|
```
|
||||||
|
|
||||||
|
|
||||||
### Options
|
### Options
|
||||||
- `--expires-at DATE` - last day on which token is active (e.g. "2019-04-05")
|
- `--expires-at DATE` - last day on which token is active (e.g. "2019-04-05")
|
||||||
- `--max-use NUMBER` - maximum numbers of token uses
|
- `--max-use NUMBER` - maximum numbers of token uses
|
||||||
|
|
||||||
## List generated invites
|
## List generated invites
|
||||||
```sh
|
```sh tab="OTP"
|
||||||
$PREFIX invites
|
./bin/pleroma_ctl user invites
|
||||||
```
|
```
|
||||||
|
|
||||||
|
```sh tab="From Source"
|
||||||
|
mix pleroma.user invites
|
||||||
|
```
|
||||||
|
|
||||||
|
|
||||||
## Revoke invite
|
## Revoke invite
|
||||||
```sh
|
```sh tab="OTP"
|
||||||
$PREFIX revoke_invite <token_or_id>
|
./bin/pleroma_ctl user revoke_invite <token_or_id>
|
||||||
```
|
```
|
||||||
|
|
||||||
|
```sh tab="From Source"
|
||||||
|
mix pleroma.user revoke_invite <token_or_id>
|
||||||
|
```
|
||||||
|
|
||||||
|
|
||||||
## Delete a user
|
## Delete a user
|
||||||
```sh
|
```sh tab="OTP"
|
||||||
$PREFIX rm <nickname>
|
./bin/pleroma_ctl user rm <nickname>
|
||||||
```
|
```
|
||||||
|
|
||||||
|
```sh tab="From Source"
|
||||||
|
mix pleroma.user rm <nickname>
|
||||||
|
```
|
||||||
|
|
||||||
|
|
||||||
## Delete user's posts and interactions
|
## Delete user's posts and interactions
|
||||||
```sh
|
```sh tab="OTP"
|
||||||
$PREFIX delete_activities <nickname>
|
./bin/pleroma_ctl user delete_activities <nickname>
|
||||||
```
|
```
|
||||||
|
|
||||||
|
```sh tab="From Source"
|
||||||
|
mix pleroma.user delete_activities <nickname>
|
||||||
|
```
|
||||||
|
|
||||||
|
|
||||||
## Sign user out from all applications (delete user's OAuth tokens and authorizations)
|
## Sign user out from all applications (delete user's OAuth tokens and authorizations)
|
||||||
```sh
|
```sh tab="OTP"
|
||||||
$PREFIX sign_out <nickname>
|
./bin/pleroma_ctl user sign_out <nickname>
|
||||||
```
|
```
|
||||||
|
|
||||||
|
```sh tab="From Source"
|
||||||
|
mix pleroma.user sign_out <nickname>
|
||||||
|
```
|
||||||
|
|
||||||
|
|
||||||
## Deactivate or activate a user
|
## Deactivate or activate a user
|
||||||
```sh
|
```sh tab="OTP"
|
||||||
$PREFIX toggle_activated <nickname>
|
./bin/pleroma_ctl user toggle_activated <nickname>
|
||||||
```
|
```
|
||||||
|
|
||||||
|
```sh tab="From Source"
|
||||||
|
mix pleroma.user toggle_activated <nickname>
|
||||||
|
```
|
||||||
|
|
||||||
|
|
||||||
## Unsubscribe local users from a user and deactivate the user
|
## Unsubscribe local users from a user and deactivate the user
|
||||||
```sh
|
```sh tab="OTP"
|
||||||
$PREFIX unsubscribe NICKNAME
|
./bin/pleroma_ctl user unsubscribe NICKNAME
|
||||||
```
|
```
|
||||||
|
|
||||||
|
```sh tab="From Source"
|
||||||
|
mix pleroma.user unsubscribe NICKNAME
|
||||||
|
```
|
||||||
|
|
||||||
|
|
||||||
## Unsubscribe local users from an instance and deactivate all accounts on it
|
## Unsubscribe local users from an instance and deactivate all accounts on it
|
||||||
```sh
|
```sh tab="OTP"
|
||||||
$PREFIX unsubscribe_all_from_instance <instance>
|
./bin/pleroma_ctl user unsubscribe_all_from_instance <instance>
|
||||||
```
|
```
|
||||||
|
|
||||||
|
```sh tab="From Source"
|
||||||
|
mix pleroma.user unsubscribe_all_from_instance <instance>
|
||||||
|
```
|
||||||
|
|
||||||
|
|
||||||
## Create a password reset link for user
|
## Create a password reset link for user
|
||||||
```sh
|
```sh tab="OTP"
|
||||||
$PREFIX reset_password <nickname>
|
./bin/pleroma_ctl user reset_password <nickname>
|
||||||
```
|
```
|
||||||
|
|
||||||
## Set the value of the given user's settings
|
```sh tab="From Source"
|
||||||
```sh
|
mix pleroma.user reset_password <nickname>
|
||||||
$PREFIX set <nickname> [<options>]
|
|
||||||
```
|
```
|
||||||
|
|
||||||
|
|
||||||
|
## Set the value of the given user's settings
|
||||||
|
```sh tab="OTP"
|
||||||
|
./bin/pleroma_ctl user set <nickname> [<options>]
|
||||||
|
```
|
||||||
|
|
||||||
|
```sh tab="From Source"
|
||||||
|
mix pleroma.user set <nickname> [<options>]
|
||||||
|
```
|
||||||
|
|
||||||
### Options
|
### Options
|
||||||
- `--locked`/`--no-locked` - whether the user should be locked
|
- `--locked`/`--no-locked` - whether the user should be locked
|
||||||
- `--moderator`/`--no-moderator` - whether the user should be a moderator
|
- `--moderator`/`--no-moderator` - whether the user should be a moderator
|
||||||
- `--admin`/`--no-admin` - whether the user should be an admin
|
- `--admin`/`--no-admin` - whether the user should be an admin
|
||||||
|
|
||||||
## Add tags to a user
|
## Add tags to a user
|
||||||
```sh
|
```sh tab="OTP"
|
||||||
$PREFIX tag <nickname> <tags>
|
./bin/pleroma_ctl user tag <nickname> <tags>
|
||||||
```
|
```
|
||||||
|
|
||||||
|
```sh tab="From Source"
|
||||||
|
mix pleroma.user tag <nickname> <tags>
|
||||||
|
```
|
||||||
|
|
||||||
|
|
||||||
## Delete tags from a user
|
## Delete tags from a user
|
||||||
```sh
|
```sh tab="OTP"
|
||||||
$PREFIX untag <nickname> <tags>
|
./bin/pleroma_ctl user untag <nickname> <tags>
|
||||||
```
|
```
|
||||||
|
|
||||||
## Toggle confirmation status of the user
|
```sh tab="From Source"
|
||||||
```sh
|
mix pleroma.user untag <nickname> <tags>
|
||||||
$PREFIX toggle_confirmed <nickname>
|
|
||||||
```
|
```
|
||||||
|
|
||||||
|
|
||||||
|
## Toggle confirmation status of the user
|
||||||
|
```sh tab="OTP"
|
||||||
|
./bin/pleroma_ctl user toggle_confirmed <nickname>
|
||||||
|
```
|
||||||
|
|
||||||
|
```sh tab="From Source"
|
||||||
|
mix pleroma.user toggle_confirmed <nickname>
|
||||||
|
```
|
||||||
|
|
||||||
|
|
83
lib/mix/tasks/pleroma/notification_settings.ex
Normal file
83
lib/mix/tasks/pleroma/notification_settings.ex
Normal file
|
@ -0,0 +1,83 @@
|
||||||
|
defmodule Mix.Tasks.Pleroma.NotificationSettings do
|
||||||
|
@shortdoc "Enable&Disable privacy option for push notifications"
|
||||||
|
@moduledoc """
|
||||||
|
Example:
|
||||||
|
|
||||||
|
> mix pleroma.notification_settings --privacy-option=false --nickname-users="parallel588" # set false only for parallel588 user
|
||||||
|
> mix pleroma.notification_settings --privacy-option=true # set true for all users
|
||||||
|
|
||||||
|
"""
|
||||||
|
|
||||||
|
use Mix.Task
|
||||||
|
import Mix.Pleroma
|
||||||
|
import Ecto.Query
|
||||||
|
|
||||||
|
def run(args) do
|
||||||
|
start_pleroma()
|
||||||
|
|
||||||
|
{options, _, _} =
|
||||||
|
OptionParser.parse(
|
||||||
|
args,
|
||||||
|
strict: [
|
||||||
|
privacy_option: :boolean,
|
||||||
|
email_users: :string,
|
||||||
|
nickname_users: :string
|
||||||
|
]
|
||||||
|
)
|
||||||
|
|
||||||
|
privacy_option = Keyword.get(options, :privacy_option)
|
||||||
|
|
||||||
|
if not is_nil(privacy_option) do
|
||||||
|
privacy_option
|
||||||
|
|> build_query(options)
|
||||||
|
|> Pleroma.Repo.update_all([])
|
||||||
|
end
|
||||||
|
|
||||||
|
shell_info("Done")
|
||||||
|
end
|
||||||
|
|
||||||
|
defp build_query(privacy_option, options) do
|
||||||
|
query =
|
||||||
|
from(u in Pleroma.User,
|
||||||
|
update: [
|
||||||
|
set: [
|
||||||
|
notification_settings:
|
||||||
|
fragment(
|
||||||
|
"jsonb_set(notification_settings, '{privacy_option}', ?)",
|
||||||
|
^privacy_option
|
||||||
|
)
|
||||||
|
]
|
||||||
|
]
|
||||||
|
)
|
||||||
|
|
||||||
|
user_emails =
|
||||||
|
options
|
||||||
|
|> Keyword.get(:email_users, "")
|
||||||
|
|> String.split(",")
|
||||||
|
|> Enum.map(&String.trim(&1))
|
||||||
|
|> Enum.reject(&(&1 == ""))
|
||||||
|
|
||||||
|
query =
|
||||||
|
if length(user_emails) > 0 do
|
||||||
|
where(query, [u], u.email in ^user_emails)
|
||||||
|
else
|
||||||
|
query
|
||||||
|
end
|
||||||
|
|
||||||
|
user_nicknames =
|
||||||
|
options
|
||||||
|
|> Keyword.get(:nickname_users, "")
|
||||||
|
|> String.split(",")
|
||||||
|
|> Enum.map(&String.trim(&1))
|
||||||
|
|> Enum.reject(&(&1 == ""))
|
||||||
|
|
||||||
|
query =
|
||||||
|
if length(user_nicknames) > 0 do
|
||||||
|
where(query, [u], u.nickname in ^user_nicknames)
|
||||||
|
else
|
||||||
|
query
|
||||||
|
end
|
||||||
|
|
||||||
|
query
|
||||||
|
end
|
||||||
|
end
|
|
@ -373,9 +373,9 @@ defmodule Mix.Tasks.Pleroma.User do
|
||||||
users
|
users
|
||||||
|> Enum.each(fn user ->
|
|> Enum.each(fn user ->
|
||||||
shell_info(
|
shell_info(
|
||||||
"#{user.nickname} moderator: #{user.info.is_moderator}, admin: #{user.info.is_admin}, locked: #{
|
"#{user.nickname} moderator: #{user.is_moderator}, admin: #{user.is_admin}, locked: #{
|
||||||
user.info.locked
|
user.locked
|
||||||
}, deactivated: #{user.info.deactivated}"
|
}, deactivated: #{user.deactivated}"
|
||||||
)
|
)
|
||||||
end)
|
end)
|
||||||
end)
|
end)
|
||||||
|
|
|
@ -30,6 +30,7 @@ defmodule Pleroma.Application do
|
||||||
# See http://elixir-lang.org/docs/stable/elixir/Application.html
|
# See http://elixir-lang.org/docs/stable/elixir/Application.html
|
||||||
# for more information on OTP Applications
|
# for more information on OTP Applications
|
||||||
def start(_type, _args) do
|
def start(_type, _args) do
|
||||||
|
Pleroma.HTML.compile_scrubbers()
|
||||||
Pleroma.Config.DeprecationWarnings.warn()
|
Pleroma.Config.DeprecationWarnings.warn()
|
||||||
setup_instrumenters()
|
setup_instrumenters()
|
||||||
|
|
||||||
|
|
|
@ -3,6 +3,25 @@
|
||||||
# SPDX-License-Identifier: AGPL-3.0-only
|
# SPDX-License-Identifier: AGPL-3.0-only
|
||||||
|
|
||||||
defmodule Pleroma.HTML do
|
defmodule Pleroma.HTML do
|
||||||
|
# Scrubbers are compiled on boot so they can be configured in OTP releases
|
||||||
|
# @on_load :compile_scrubbers
|
||||||
|
|
||||||
|
def compile_scrubbers do
|
||||||
|
dir = Path.join(:code.priv_dir(:pleroma), "scrubbers")
|
||||||
|
|
||||||
|
dir
|
||||||
|
|> File.ls!()
|
||||||
|
|> Enum.map(&Path.join(dir, &1))
|
||||||
|
|> Kernel.ParallelCompiler.compile()
|
||||||
|
|> case do
|
||||||
|
{:error, _errors, _warnings} ->
|
||||||
|
raise "Compiling scrubbers failed"
|
||||||
|
|
||||||
|
{:ok, _modules, _warnings} ->
|
||||||
|
:ok
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
defp get_scrubbers(scrubber) when is_atom(scrubber), do: [scrubber]
|
defp get_scrubbers(scrubber) when is_atom(scrubber), do: [scrubber]
|
||||||
defp get_scrubbers(scrubbers) when is_list(scrubbers), do: scrubbers
|
defp get_scrubbers(scrubbers) when is_list(scrubbers), do: scrubbers
|
||||||
defp get_scrubbers(_), do: [Pleroma.HTML.Scrubber.Default]
|
defp get_scrubbers(_), do: [Pleroma.HTML.Scrubber.Default]
|
||||||
|
@ -99,216 +118,3 @@ defmodule Pleroma.HTML do
|
||||||
end)
|
end)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
defmodule Pleroma.HTML.Scrubber.TwitterText do
|
|
||||||
@moduledoc """
|
|
||||||
An HTML scrubbing policy which limits to twitter-style text. Only
|
|
||||||
paragraphs, breaks and links are allowed through the filter.
|
|
||||||
"""
|
|
||||||
|
|
||||||
@valid_schemes Pleroma.Config.get([:uri_schemes, :valid_schemes], [])
|
|
||||||
|
|
||||||
require FastSanitize.Sanitizer.Meta
|
|
||||||
alias FastSanitize.Sanitizer.Meta
|
|
||||||
|
|
||||||
Meta.strip_comments()
|
|
||||||
|
|
||||||
# links
|
|
||||||
Meta.allow_tag_with_uri_attributes(:a, ["href", "data-user", "data-tag"], @valid_schemes)
|
|
||||||
|
|
||||||
Meta.allow_tag_with_this_attribute_values(:a, "class", [
|
|
||||||
"hashtag",
|
|
||||||
"u-url",
|
|
||||||
"mention",
|
|
||||||
"u-url mention",
|
|
||||||
"mention u-url"
|
|
||||||
])
|
|
||||||
|
|
||||||
Meta.allow_tag_with_this_attribute_values(:a, "rel", [
|
|
||||||
"tag",
|
|
||||||
"nofollow",
|
|
||||||
"noopener",
|
|
||||||
"noreferrer"
|
|
||||||
])
|
|
||||||
|
|
||||||
Meta.allow_tag_with_these_attributes(:a, ["name", "title"])
|
|
||||||
|
|
||||||
# paragraphs and linebreaks
|
|
||||||
Meta.allow_tag_with_these_attributes(:br, [])
|
|
||||||
Meta.allow_tag_with_these_attributes(:p, [])
|
|
||||||
|
|
||||||
# microformats
|
|
||||||
Meta.allow_tag_with_this_attribute_values(:span, "class", ["h-card"])
|
|
||||||
Meta.allow_tag_with_these_attributes(:span, [])
|
|
||||||
|
|
||||||
# allow inline images for custom emoji
|
|
||||||
if Pleroma.Config.get([:markup, :allow_inline_images]) do
|
|
||||||
# restrict img tags to http/https only, because of MediaProxy.
|
|
||||||
Meta.allow_tag_with_uri_attributes(:img, ["src"], ["http", "https"])
|
|
||||||
|
|
||||||
Meta.allow_tag_with_these_attributes(:img, [
|
|
||||||
"width",
|
|
||||||
"height",
|
|
||||||
"class",
|
|
||||||
"title",
|
|
||||||
"alt"
|
|
||||||
])
|
|
||||||
end
|
|
||||||
|
|
||||||
Meta.strip_everything_not_covered()
|
|
||||||
end
|
|
||||||
|
|
||||||
defmodule Pleroma.HTML.Scrubber.Default do
|
|
||||||
@doc "The default HTML scrubbing policy: no "
|
|
||||||
|
|
||||||
require FastSanitize.Sanitizer.Meta
|
|
||||||
alias FastSanitize.Sanitizer.Meta
|
|
||||||
|
|
||||||
# credo:disable-for-previous-line
|
|
||||||
# No idea how to fix this one…
|
|
||||||
|
|
||||||
@valid_schemes Pleroma.Config.get([:uri_schemes, :valid_schemes], [])
|
|
||||||
|
|
||||||
Meta.strip_comments()
|
|
||||||
|
|
||||||
Meta.allow_tag_with_uri_attributes(:a, ["href", "data-user", "data-tag"], @valid_schemes)
|
|
||||||
|
|
||||||
Meta.allow_tag_with_this_attribute_values(:a, "class", [
|
|
||||||
"hashtag",
|
|
||||||
"u-url",
|
|
||||||
"mention",
|
|
||||||
"u-url mention",
|
|
||||||
"mention u-url"
|
|
||||||
])
|
|
||||||
|
|
||||||
Meta.allow_tag_with_this_attribute_values(:a, "rel", [
|
|
||||||
"tag",
|
|
||||||
"nofollow",
|
|
||||||
"noopener",
|
|
||||||
"noreferrer",
|
|
||||||
"ugc"
|
|
||||||
])
|
|
||||||
|
|
||||||
Meta.allow_tag_with_these_attributes(:a, ["name", "title"])
|
|
||||||
|
|
||||||
Meta.allow_tag_with_these_attributes(:abbr, ["title"])
|
|
||||||
|
|
||||||
Meta.allow_tag_with_these_attributes(:b, [])
|
|
||||||
Meta.allow_tag_with_these_attributes(:blockquote, [])
|
|
||||||
Meta.allow_tag_with_these_attributes(:br, [])
|
|
||||||
Meta.allow_tag_with_these_attributes(:code, [])
|
|
||||||
Meta.allow_tag_with_these_attributes(:del, [])
|
|
||||||
Meta.allow_tag_with_these_attributes(:em, [])
|
|
||||||
Meta.allow_tag_with_these_attributes(:i, [])
|
|
||||||
Meta.allow_tag_with_these_attributes(:li, [])
|
|
||||||
Meta.allow_tag_with_these_attributes(:ol, [])
|
|
||||||
Meta.allow_tag_with_these_attributes(:p, [])
|
|
||||||
Meta.allow_tag_with_these_attributes(:pre, [])
|
|
||||||
Meta.allow_tag_with_these_attributes(:strong, [])
|
|
||||||
Meta.allow_tag_with_these_attributes(:sub, [])
|
|
||||||
Meta.allow_tag_with_these_attributes(:sup, [])
|
|
||||||
Meta.allow_tag_with_these_attributes(:u, [])
|
|
||||||
Meta.allow_tag_with_these_attributes(:ul, [])
|
|
||||||
|
|
||||||
Meta.allow_tag_with_this_attribute_values(:span, "class", ["h-card"])
|
|
||||||
Meta.allow_tag_with_these_attributes(:span, [])
|
|
||||||
|
|
||||||
@allow_inline_images Pleroma.Config.get([:markup, :allow_inline_images])
|
|
||||||
|
|
||||||
if @allow_inline_images do
|
|
||||||
# restrict img tags to http/https only, because of MediaProxy.
|
|
||||||
Meta.allow_tag_with_uri_attributes(:img, ["src"], ["http", "https"])
|
|
||||||
|
|
||||||
Meta.allow_tag_with_these_attributes(:img, [
|
|
||||||
"width",
|
|
||||||
"height",
|
|
||||||
"class",
|
|
||||||
"title",
|
|
||||||
"alt"
|
|
||||||
])
|
|
||||||
end
|
|
||||||
|
|
||||||
if Pleroma.Config.get([:markup, :allow_tables]) do
|
|
||||||
Meta.allow_tag_with_these_attributes(:table, [])
|
|
||||||
Meta.allow_tag_with_these_attributes(:tbody, [])
|
|
||||||
Meta.allow_tag_with_these_attributes(:td, [])
|
|
||||||
Meta.allow_tag_with_these_attributes(:th, [])
|
|
||||||
Meta.allow_tag_with_these_attributes(:thead, [])
|
|
||||||
Meta.allow_tag_with_these_attributes(:tr, [])
|
|
||||||
end
|
|
||||||
|
|
||||||
if Pleroma.Config.get([:markup, :allow_headings]) do
|
|
||||||
Meta.allow_tag_with_these_attributes(:h1, [])
|
|
||||||
Meta.allow_tag_with_these_attributes(:h2, [])
|
|
||||||
Meta.allow_tag_with_these_attributes(:h3, [])
|
|
||||||
Meta.allow_tag_with_these_attributes(:h4, [])
|
|
||||||
Meta.allow_tag_with_these_attributes(:h5, [])
|
|
||||||
end
|
|
||||||
|
|
||||||
if Pleroma.Config.get([:markup, :allow_fonts]) do
|
|
||||||
Meta.allow_tag_with_these_attributes(:font, ["face"])
|
|
||||||
end
|
|
||||||
|
|
||||||
Meta.strip_everything_not_covered()
|
|
||||||
end
|
|
||||||
|
|
||||||
defmodule Pleroma.HTML.Transform.MediaProxy do
|
|
||||||
@moduledoc "Transforms inline image URIs to use MediaProxy."
|
|
||||||
|
|
||||||
alias Pleroma.Web.MediaProxy
|
|
||||||
|
|
||||||
def before_scrub(html), do: html
|
|
||||||
|
|
||||||
def scrub_attribute(:img, {"src", "http" <> target}) do
|
|
||||||
media_url =
|
|
||||||
("http" <> target)
|
|
||||||
|> MediaProxy.url()
|
|
||||||
|
|
||||||
{"src", media_url}
|
|
||||||
end
|
|
||||||
|
|
||||||
def scrub_attribute(_tag, attribute), do: attribute
|
|
||||||
|
|
||||||
def scrub({:img, attributes, children}) do
|
|
||||||
attributes =
|
|
||||||
attributes
|
|
||||||
|> Enum.map(fn attr -> scrub_attribute(:img, attr) end)
|
|
||||||
|> Enum.reject(&is_nil(&1))
|
|
||||||
|
|
||||||
{:img, attributes, children}
|
|
||||||
end
|
|
||||||
|
|
||||||
def scrub({:comment, _text, _children}), do: ""
|
|
||||||
|
|
||||||
def scrub({tag, attributes, children}), do: {tag, attributes, children}
|
|
||||||
def scrub({_tag, children}), do: children
|
|
||||||
def scrub(text), do: text
|
|
||||||
end
|
|
||||||
|
|
||||||
defmodule Pleroma.HTML.Scrubber.LinksOnly do
|
|
||||||
@moduledoc """
|
|
||||||
An HTML scrubbing policy which limits to links only.
|
|
||||||
"""
|
|
||||||
|
|
||||||
@valid_schemes Pleroma.Config.get([:uri_schemes, :valid_schemes], [])
|
|
||||||
|
|
||||||
require FastSanitize.Sanitizer.Meta
|
|
||||||
alias FastSanitize.Sanitizer.Meta
|
|
||||||
|
|
||||||
Meta.strip_comments()
|
|
||||||
|
|
||||||
# links
|
|
||||||
Meta.allow_tag_with_uri_attributes(:a, ["href"], @valid_schemes)
|
|
||||||
|
|
||||||
Meta.allow_tag_with_this_attribute_values(:a, "rel", [
|
|
||||||
"tag",
|
|
||||||
"nofollow",
|
|
||||||
"noopener",
|
|
||||||
"noreferrer",
|
|
||||||
"me",
|
|
||||||
"ugc"
|
|
||||||
])
|
|
||||||
|
|
||||||
Meta.allow_tag_with_these_attributes(:a, ["name", "title"])
|
|
||||||
Meta.strip_everything_not_covered()
|
|
||||||
end
|
|
||||||
|
|
|
@ -121,10 +121,28 @@ defmodule Pleroma.Notification do
|
||||||
when is_list(visibility) do
|
when is_list(visibility) do
|
||||||
if Enum.all?(visibility, &(&1 in @valid_visibilities)) do
|
if Enum.all?(visibility, &(&1 in @valid_visibilities)) do
|
||||||
query
|
query
|
||||||
|
|> join(:left, [n, a], mutated_activity in Pleroma.Activity,
|
||||||
|
on:
|
||||||
|
fragment("?->>'context'", a.data) ==
|
||||||
|
fragment("?->>'context'", mutated_activity.data) and
|
||||||
|
fragment("(?->>'type' = 'Like' or ?->>'type' = 'Announce')", a.data, a.data) and
|
||||||
|
fragment("?->>'type'", mutated_activity.data) == "Create",
|
||||||
|
as: :mutated_activity
|
||||||
|
)
|
||||||
|> where(
|
|> where(
|
||||||
[n, a],
|
[n, a, mutated_activity: mutated_activity],
|
||||||
not fragment(
|
not fragment(
|
||||||
"activity_visibility(?, ?, ?) = ANY (?)",
|
"""
|
||||||
|
CASE WHEN (?->>'type') = 'Like' or (?->>'type') = 'Announce'
|
||||||
|
THEN (activity_visibility(?, ?, ?) = ANY (?))
|
||||||
|
ELSE (activity_visibility(?, ?, ?) = ANY (?)) END
|
||||||
|
""",
|
||||||
|
a.data,
|
||||||
|
a.data,
|
||||||
|
mutated_activity.actor,
|
||||||
|
mutated_activity.recipients,
|
||||||
|
mutated_activity.data,
|
||||||
|
^visibility,
|
||||||
a.actor,
|
a.actor,
|
||||||
a.recipients,
|
a.recipients,
|
||||||
a.data,
|
a.data,
|
||||||
|
@ -139,17 +157,7 @@ defmodule Pleroma.Notification do
|
||||||
|
|
||||||
defp exclude_visibility(query, %{exclude_visibilities: visibility})
|
defp exclude_visibility(query, %{exclude_visibilities: visibility})
|
||||||
when visibility in @valid_visibilities do
|
when visibility in @valid_visibilities do
|
||||||
query
|
exclude_visibility(query, [visibility])
|
||||||
|> where(
|
|
||||||
[n, a],
|
|
||||||
not fragment(
|
|
||||||
"activity_visibility(?, ?, ?) = (?)",
|
|
||||||
a.actor,
|
|
||||||
a.recipients,
|
|
||||||
a.data,
|
|
||||||
^visibility
|
|
||||||
)
|
|
||||||
)
|
|
||||||
end
|
end
|
||||||
|
|
||||||
defp exclude_visibility(query, %{exclude_visibilities: visibility})
|
defp exclude_visibility(query, %{exclude_visibilities: visibility})
|
||||||
|
@ -347,7 +355,7 @@ defmodule Pleroma.Notification do
|
||||||
def skip?(
|
def skip?(
|
||||||
:followers,
|
:followers,
|
||||||
activity,
|
activity,
|
||||||
%{notification_settings: %{"followers" => false}} = user
|
%{notification_settings: %{followers: false}} = user
|
||||||
) do
|
) do
|
||||||
actor = activity.data["actor"]
|
actor = activity.data["actor"]
|
||||||
follower = User.get_cached_by_ap_id(actor)
|
follower = User.get_cached_by_ap_id(actor)
|
||||||
|
@ -357,14 +365,14 @@ defmodule Pleroma.Notification do
|
||||||
def skip?(
|
def skip?(
|
||||||
:non_followers,
|
:non_followers,
|
||||||
activity,
|
activity,
|
||||||
%{notification_settings: %{"non_followers" => false}} = user
|
%{notification_settings: %{non_followers: false}} = user
|
||||||
) do
|
) do
|
||||||
actor = activity.data["actor"]
|
actor = activity.data["actor"]
|
||||||
follower = User.get_cached_by_ap_id(actor)
|
follower = User.get_cached_by_ap_id(actor)
|
||||||
!User.following?(follower, user)
|
!User.following?(follower, user)
|
||||||
end
|
end
|
||||||
|
|
||||||
def skip?(:follows, activity, %{notification_settings: %{"follows" => false}} = user) do
|
def skip?(:follows, activity, %{notification_settings: %{follows: false}} = user) do
|
||||||
actor = activity.data["actor"]
|
actor = activity.data["actor"]
|
||||||
followed = User.get_cached_by_ap_id(actor)
|
followed = User.get_cached_by_ap_id(actor)
|
||||||
User.following?(user, followed)
|
User.following?(user, followed)
|
||||||
|
@ -373,7 +381,7 @@ defmodule Pleroma.Notification do
|
||||||
def skip?(
|
def skip?(
|
||||||
:non_follows,
|
:non_follows,
|
||||||
activity,
|
activity,
|
||||||
%{notification_settings: %{"non_follows" => false}} = user
|
%{notification_settings: %{non_follows: false}} = user
|
||||||
) do
|
) do
|
||||||
actor = activity.data["actor"]
|
actor = activity.data["actor"]
|
||||||
followed = User.get_cached_by_ap_id(actor)
|
followed = User.get_cached_by_ap_id(actor)
|
||||||
|
|
21
lib/pleroma/plugs/parsers_plug.ex
Normal file
21
lib/pleroma/plugs/parsers_plug.ex
Normal file
|
@ -0,0 +1,21 @@
|
||||||
|
# Pleroma: A lightweight social networking server
|
||||||
|
# Copyright © 2017-2019 Pleroma Authors <https://pleroma.social/>
|
||||||
|
# SPDX-License-Identifier: AGPL-3.0-only
|
||||||
|
|
||||||
|
defmodule Pleroma.Plugs.Parsers do
|
||||||
|
@moduledoc "Initializes Plug.Parsers with upload limit set at boot time"
|
||||||
|
|
||||||
|
@behaviour Plug
|
||||||
|
|
||||||
|
def init(_opts) do
|
||||||
|
Plug.Parsers.init(
|
||||||
|
parsers: [:urlencoded, :multipart, :json],
|
||||||
|
pass: ["*/*"],
|
||||||
|
json_decoder: Jason,
|
||||||
|
length: Pleroma.Config.get([:instance, :upload_limit]),
|
||||||
|
body_reader: {Pleroma.Web.Plugs.DigestPlug, :read_body, []}
|
||||||
|
)
|
||||||
|
end
|
||||||
|
|
||||||
|
defdelegate call(conn, opts), to: Plug.Parsers
|
||||||
|
end
|
|
@ -129,13 +129,10 @@ defmodule Pleroma.User do
|
||||||
field(:skip_thread_containment, :boolean, default: false)
|
field(:skip_thread_containment, :boolean, default: false)
|
||||||
field(:also_known_as, {:array, :string}, default: [])
|
field(:also_known_as, {:array, :string}, default: [])
|
||||||
|
|
||||||
field(:notification_settings, :map,
|
embeds_one(
|
||||||
default: %{
|
:notification_settings,
|
||||||
"followers" => true,
|
Pleroma.User.NotificationSetting,
|
||||||
"follows" => true,
|
on_replace: :update
|
||||||
"non_follows" => true,
|
|
||||||
"non_followers" => true
|
|
||||||
}
|
|
||||||
)
|
)
|
||||||
|
|
||||||
has_many(:notifications, Notification)
|
has_many(:notifications, Notification)
|
||||||
|
@ -1221,20 +1218,9 @@ defmodule Pleroma.User do
|
||||||
end
|
end
|
||||||
|
|
||||||
def update_notification_settings(%User{} = user, settings) do
|
def update_notification_settings(%User{} = user, settings) do
|
||||||
settings =
|
|
||||||
settings
|
|
||||||
|> Enum.map(fn {k, v} -> {k, v in [true, "true", "True", "1"]} end)
|
|
||||||
|> Map.new()
|
|
||||||
|
|
||||||
notification_settings =
|
|
||||||
user.notification_settings
|
|
||||||
|> Map.merge(settings)
|
|
||||||
|> Map.take(["followers", "follows", "non_follows", "non_followers"])
|
|
||||||
|
|
||||||
params = %{notification_settings: notification_settings}
|
|
||||||
|
|
||||||
user
|
user
|
||||||
|> cast(params, [:notification_settings])
|
|> cast(%{notification_settings: settings}, [])
|
||||||
|
|> cast_embed(:notification_settings)
|
||||||
|> validate_required([:notification_settings])
|
|> validate_required([:notification_settings])
|
||||||
|> update_and_set_cache()
|
|> update_and_set_cache()
|
||||||
end
|
end
|
||||||
|
|
40
lib/pleroma/user/notification_setting.ex
Normal file
40
lib/pleroma/user/notification_setting.ex
Normal file
|
@ -0,0 +1,40 @@
|
||||||
|
# Pleroma: A lightweight social networking server
|
||||||
|
# Copyright © 2017-2019 Pleroma Authors <https://pleroma.social/>
|
||||||
|
# SPDX-License-Identifier: AGPL-3.0-only
|
||||||
|
|
||||||
|
defmodule Pleroma.User.NotificationSetting do
|
||||||
|
use Ecto.Schema
|
||||||
|
import Ecto.Changeset
|
||||||
|
|
||||||
|
@derive Jason.Encoder
|
||||||
|
@primary_key false
|
||||||
|
|
||||||
|
embedded_schema do
|
||||||
|
field(:followers, :boolean, default: true)
|
||||||
|
field(:follows, :boolean, default: true)
|
||||||
|
field(:non_follows, :boolean, default: true)
|
||||||
|
field(:non_followers, :boolean, default: true)
|
||||||
|
field(:privacy_option, :boolean, default: false)
|
||||||
|
end
|
||||||
|
|
||||||
|
def changeset(schema, params) do
|
||||||
|
schema
|
||||||
|
|> cast(prepare_attrs(params), [
|
||||||
|
:followers,
|
||||||
|
:follows,
|
||||||
|
:non_follows,
|
||||||
|
:non_followers,
|
||||||
|
:privacy_option
|
||||||
|
])
|
||||||
|
end
|
||||||
|
|
||||||
|
defp prepare_attrs(params) do
|
||||||
|
Enum.reduce(params, %{}, fn
|
||||||
|
{k, v}, acc when is_binary(v) ->
|
||||||
|
Map.put(acc, k, String.downcase(v))
|
||||||
|
|
||||||
|
{k, v}, acc ->
|
||||||
|
Map.put(acc, k, v)
|
||||||
|
end)
|
||||||
|
end
|
||||||
|
end
|
|
@ -61,14 +61,7 @@ defmodule Pleroma.Web.Endpoint do
|
||||||
plug(Plug.RequestId)
|
plug(Plug.RequestId)
|
||||||
plug(Plug.Logger)
|
plug(Plug.Logger)
|
||||||
|
|
||||||
plug(
|
plug(Pleroma.Plugs.Parsers)
|
||||||
Plug.Parsers,
|
|
||||||
parsers: [:urlencoded, :multipart, :json],
|
|
||||||
pass: ["*/*"],
|
|
||||||
json_decoder: Jason,
|
|
||||||
length: Pleroma.Config.get([:instance, :upload_limit]),
|
|
||||||
body_reader: {Pleroma.Web.Plugs.DigestPlug, :read_body, []}
|
|
||||||
)
|
|
||||||
|
|
||||||
plug(Plug.MethodOverride)
|
plug(Plug.MethodOverride)
|
||||||
plug(Plug.Head)
|
plug(Plug.Head)
|
||||||
|
|
|
@ -22,8 +22,8 @@ defmodule Pleroma.Web.Push.Impl do
|
||||||
@spec perform(Notification.t()) :: list(any) | :error
|
@spec perform(Notification.t()) :: list(any) | :error
|
||||||
def perform(
|
def perform(
|
||||||
%{
|
%{
|
||||||
activity: %{data: %{"type" => activity_type}, id: activity_id} = activity,
|
activity: %{data: %{"type" => activity_type}} = activity,
|
||||||
user_id: user_id
|
user: %User{id: user_id}
|
||||||
} = notif
|
} = notif
|
||||||
)
|
)
|
||||||
when activity_type in @types do
|
when activity_type in @types do
|
||||||
|
@ -39,18 +39,17 @@ defmodule Pleroma.Web.Push.Impl do
|
||||||
for subscription <- fetch_subsriptions(user_id),
|
for subscription <- fetch_subsriptions(user_id),
|
||||||
get_in(subscription.data, ["alerts", type]) do
|
get_in(subscription.data, ["alerts", type]) do
|
||||||
%{
|
%{
|
||||||
title: format_title(notif),
|
|
||||||
access_token: subscription.token.token,
|
access_token: subscription.token.token,
|
||||||
body: format_body(notif, actor, object),
|
|
||||||
notification_id: notif.id,
|
notification_id: notif.id,
|
||||||
notification_type: type,
|
notification_type: type,
|
||||||
icon: avatar_url,
|
icon: avatar_url,
|
||||||
preferred_locale: "en",
|
preferred_locale: "en",
|
||||||
pleroma: %{
|
pleroma: %{
|
||||||
activity_id: activity_id,
|
activity_id: notif.activity.id,
|
||||||
direct_conversation_id: direct_conversation_id
|
direct_conversation_id: direct_conversation_id
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|> Map.merge(build_content(notif, actor, object))
|
||||||
|> Jason.encode!()
|
|> Jason.encode!()
|
||||||
|> push_message(build_sub(subscription), gcm_api_key, subscription)
|
|> push_message(build_sub(subscription), gcm_api_key, subscription)
|
||||||
end
|
end
|
||||||
|
@ -100,6 +99,24 @@ defmodule Pleroma.Web.Push.Impl do
|
||||||
}
|
}
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def build_content(
|
||||||
|
%{
|
||||||
|
activity: %{data: %{"directMessage" => true}},
|
||||||
|
user: %{notification_settings: %{privacy_option: true}}
|
||||||
|
},
|
||||||
|
actor,
|
||||||
|
_
|
||||||
|
) do
|
||||||
|
%{title: "New Direct Message", body: "@#{actor.nickname}"}
|
||||||
|
end
|
||||||
|
|
||||||
|
def build_content(notif, actor, object) do
|
||||||
|
%{
|
||||||
|
title: format_title(notif),
|
||||||
|
body: format_body(notif, actor, object)
|
||||||
|
}
|
||||||
|
end
|
||||||
|
|
||||||
def format_body(
|
def format_body(
|
||||||
%{activity: %{data: %{"type" => "Create"}}},
|
%{activity: %{data: %{"type" => "Create"}}},
|
||||||
actor,
|
actor,
|
||||||
|
|
|
@ -13,7 +13,7 @@ defmodule Pleroma.Workers.WebPusherWorker do
|
||||||
notification =
|
notification =
|
||||||
Notification
|
Notification
|
||||||
|> Repo.get(notification_id)
|
|> Repo.get(notification_id)
|
||||||
|> Repo.preload([:activity])
|
|> Repo.preload([:activity, :user])
|
||||||
|
|
||||||
Pleroma.Web.Push.Impl.perform(notification)
|
Pleroma.Web.Push.Impl.perform(notification)
|
||||||
end
|
end
|
||||||
|
|
93
priv/scrubbers/default.ex
Normal file
93
priv/scrubbers/default.ex
Normal file
|
@ -0,0 +1,93 @@
|
||||||
|
defmodule Pleroma.HTML.Scrubber.Default do
|
||||||
|
@doc "The default HTML scrubbing policy: no "
|
||||||
|
|
||||||
|
require FastSanitize.Sanitizer.Meta
|
||||||
|
alias FastSanitize.Sanitizer.Meta
|
||||||
|
|
||||||
|
# credo:disable-for-previous-line
|
||||||
|
# No idea how to fix this one…
|
||||||
|
|
||||||
|
@valid_schemes Pleroma.Config.get([:uri_schemes, :valid_schemes], [])
|
||||||
|
|
||||||
|
Meta.strip_comments()
|
||||||
|
|
||||||
|
Meta.allow_tag_with_uri_attributes(:a, ["href", "data-user", "data-tag"], @valid_schemes)
|
||||||
|
|
||||||
|
Meta.allow_tag_with_this_attribute_values(:a, "class", [
|
||||||
|
"hashtag",
|
||||||
|
"u-url",
|
||||||
|
"mention",
|
||||||
|
"u-url mention",
|
||||||
|
"mention u-url"
|
||||||
|
])
|
||||||
|
|
||||||
|
Meta.allow_tag_with_this_attribute_values(:a, "rel", [
|
||||||
|
"tag",
|
||||||
|
"nofollow",
|
||||||
|
"noopener",
|
||||||
|
"noreferrer",
|
||||||
|
"ugc"
|
||||||
|
])
|
||||||
|
|
||||||
|
Meta.allow_tag_with_these_attributes(:a, ["name", "title"])
|
||||||
|
|
||||||
|
Meta.allow_tag_with_these_attributes(:abbr, ["title"])
|
||||||
|
|
||||||
|
Meta.allow_tag_with_these_attributes(:b, [])
|
||||||
|
Meta.allow_tag_with_these_attributes(:blockquote, [])
|
||||||
|
Meta.allow_tag_with_these_attributes(:br, [])
|
||||||
|
Meta.allow_tag_with_these_attributes(:code, [])
|
||||||
|
Meta.allow_tag_with_these_attributes(:del, [])
|
||||||
|
Meta.allow_tag_with_these_attributes(:em, [])
|
||||||
|
Meta.allow_tag_with_these_attributes(:i, [])
|
||||||
|
Meta.allow_tag_with_these_attributes(:li, [])
|
||||||
|
Meta.allow_tag_with_these_attributes(:ol, [])
|
||||||
|
Meta.allow_tag_with_these_attributes(:p, [])
|
||||||
|
Meta.allow_tag_with_these_attributes(:pre, [])
|
||||||
|
Meta.allow_tag_with_these_attributes(:strong, [])
|
||||||
|
Meta.allow_tag_with_these_attributes(:sub, [])
|
||||||
|
Meta.allow_tag_with_these_attributes(:sup, [])
|
||||||
|
Meta.allow_tag_with_these_attributes(:u, [])
|
||||||
|
Meta.allow_tag_with_these_attributes(:ul, [])
|
||||||
|
|
||||||
|
Meta.allow_tag_with_this_attribute_values(:span, "class", ["h-card"])
|
||||||
|
Meta.allow_tag_with_these_attributes(:span, [])
|
||||||
|
|
||||||
|
@allow_inline_images Pleroma.Config.get([:markup, :allow_inline_images])
|
||||||
|
|
||||||
|
if @allow_inline_images do
|
||||||
|
# restrict img tags to http/https only, because of MediaProxy.
|
||||||
|
Meta.allow_tag_with_uri_attributes(:img, ["src"], ["http", "https"])
|
||||||
|
|
||||||
|
Meta.allow_tag_with_these_attributes(:img, [
|
||||||
|
"width",
|
||||||
|
"height",
|
||||||
|
"class",
|
||||||
|
"title",
|
||||||
|
"alt"
|
||||||
|
])
|
||||||
|
end
|
||||||
|
|
||||||
|
if Pleroma.Config.get([:markup, :allow_tables]) do
|
||||||
|
Meta.allow_tag_with_these_attributes(:table, [])
|
||||||
|
Meta.allow_tag_with_these_attributes(:tbody, [])
|
||||||
|
Meta.allow_tag_with_these_attributes(:td, [])
|
||||||
|
Meta.allow_tag_with_these_attributes(:th, [])
|
||||||
|
Meta.allow_tag_with_these_attributes(:thead, [])
|
||||||
|
Meta.allow_tag_with_these_attributes(:tr, [])
|
||||||
|
end
|
||||||
|
|
||||||
|
if Pleroma.Config.get([:markup, :allow_headings]) do
|
||||||
|
Meta.allow_tag_with_these_attributes(:h1, [])
|
||||||
|
Meta.allow_tag_with_these_attributes(:h2, [])
|
||||||
|
Meta.allow_tag_with_these_attributes(:h3, [])
|
||||||
|
Meta.allow_tag_with_these_attributes(:h4, [])
|
||||||
|
Meta.allow_tag_with_these_attributes(:h5, [])
|
||||||
|
end
|
||||||
|
|
||||||
|
if Pleroma.Config.get([:markup, :allow_fonts]) do
|
||||||
|
Meta.allow_tag_with_these_attributes(:font, ["face"])
|
||||||
|
end
|
||||||
|
|
||||||
|
Meta.strip_everything_not_covered()
|
||||||
|
end
|
27
priv/scrubbers/links_only.ex
Normal file
27
priv/scrubbers/links_only.ex
Normal file
|
@ -0,0 +1,27 @@
|
||||||
|
defmodule Pleroma.HTML.Scrubber.LinksOnly do
|
||||||
|
@moduledoc """
|
||||||
|
An HTML scrubbing policy which limits to links only.
|
||||||
|
"""
|
||||||
|
|
||||||
|
@valid_schemes Pleroma.Config.get([:uri_schemes, :valid_schemes], [])
|
||||||
|
|
||||||
|
require FastSanitize.Sanitizer.Meta
|
||||||
|
alias FastSanitize.Sanitizer.Meta
|
||||||
|
|
||||||
|
Meta.strip_comments()
|
||||||
|
|
||||||
|
# links
|
||||||
|
Meta.allow_tag_with_uri_attributes(:a, ["href"], @valid_schemes)
|
||||||
|
|
||||||
|
Meta.allow_tag_with_this_attribute_values(:a, "rel", [
|
||||||
|
"tag",
|
||||||
|
"nofollow",
|
||||||
|
"noopener",
|
||||||
|
"noreferrer",
|
||||||
|
"me",
|
||||||
|
"ugc"
|
||||||
|
])
|
||||||
|
|
||||||
|
Meta.allow_tag_with_these_attributes(:a, ["name", "title"])
|
||||||
|
Meta.strip_everything_not_covered()
|
||||||
|
end
|
32
priv/scrubbers/media_proxy.ex
Normal file
32
priv/scrubbers/media_proxy.ex
Normal file
|
@ -0,0 +1,32 @@
|
||||||
|
defmodule Pleroma.HTML.Transform.MediaProxy do
|
||||||
|
@moduledoc "Transforms inline image URIs to use MediaProxy."
|
||||||
|
|
||||||
|
alias Pleroma.Web.MediaProxy
|
||||||
|
|
||||||
|
def before_scrub(html), do: html
|
||||||
|
|
||||||
|
def scrub_attribute(:img, {"src", "http" <> target}) do
|
||||||
|
media_url =
|
||||||
|
("http" <> target)
|
||||||
|
|> MediaProxy.url()
|
||||||
|
|
||||||
|
{"src", media_url}
|
||||||
|
end
|
||||||
|
|
||||||
|
def scrub_attribute(_tag, attribute), do: attribute
|
||||||
|
|
||||||
|
def scrub({:img, attributes, children}) do
|
||||||
|
attributes =
|
||||||
|
attributes
|
||||||
|
|> Enum.map(fn attr -> scrub_attribute(:img, attr) end)
|
||||||
|
|> Enum.reject(&is_nil(&1))
|
||||||
|
|
||||||
|
{:img, attributes, children}
|
||||||
|
end
|
||||||
|
|
||||||
|
def scrub({:comment, _text, _children}), do: ""
|
||||||
|
|
||||||
|
def scrub({tag, attributes, children}), do: {tag, attributes, children}
|
||||||
|
def scrub({_tag, children}), do: children
|
||||||
|
def scrub(text), do: text
|
||||||
|
end
|
57
priv/scrubbers/twitter_text.ex
Normal file
57
priv/scrubbers/twitter_text.ex
Normal file
|
@ -0,0 +1,57 @@
|
||||||
|
defmodule Pleroma.HTML.Scrubber.TwitterText do
|
||||||
|
@moduledoc """
|
||||||
|
An HTML scrubbing policy which limits to twitter-style text. Only
|
||||||
|
paragraphs, breaks and links are allowed through the filter.
|
||||||
|
"""
|
||||||
|
|
||||||
|
@valid_schemes Pleroma.Config.get([:uri_schemes, :valid_schemes], [])
|
||||||
|
|
||||||
|
require FastSanitize.Sanitizer.Meta
|
||||||
|
alias FastSanitize.Sanitizer.Meta
|
||||||
|
|
||||||
|
Meta.strip_comments()
|
||||||
|
|
||||||
|
# links
|
||||||
|
Meta.allow_tag_with_uri_attributes(:a, ["href", "data-user", "data-tag"], @valid_schemes)
|
||||||
|
|
||||||
|
Meta.allow_tag_with_this_attribute_values(:a, "class", [
|
||||||
|
"hashtag",
|
||||||
|
"u-url",
|
||||||
|
"mention",
|
||||||
|
"u-url mention",
|
||||||
|
"mention u-url"
|
||||||
|
])
|
||||||
|
|
||||||
|
Meta.allow_tag_with_this_attribute_values(:a, "rel", [
|
||||||
|
"tag",
|
||||||
|
"nofollow",
|
||||||
|
"noopener",
|
||||||
|
"noreferrer"
|
||||||
|
])
|
||||||
|
|
||||||
|
Meta.allow_tag_with_these_attributes(:a, ["name", "title"])
|
||||||
|
|
||||||
|
# paragraphs and linebreaks
|
||||||
|
Meta.allow_tag_with_these_attributes(:br, [])
|
||||||
|
Meta.allow_tag_with_these_attributes(:p, [])
|
||||||
|
|
||||||
|
# microformats
|
||||||
|
Meta.allow_tag_with_this_attribute_values(:span, "class", ["h-card"])
|
||||||
|
Meta.allow_tag_with_these_attributes(:span, [])
|
||||||
|
|
||||||
|
# allow inline images for custom emoji
|
||||||
|
if Pleroma.Config.get([:markup, :allow_inline_images]) do
|
||||||
|
# restrict img tags to http/https only, because of MediaProxy.
|
||||||
|
Meta.allow_tag_with_uri_attributes(:img, ["src"], ["http", "https"])
|
||||||
|
|
||||||
|
Meta.allow_tag_with_these_attributes(:img, [
|
||||||
|
"width",
|
||||||
|
"height",
|
||||||
|
"class",
|
||||||
|
"title",
|
||||||
|
"alt"
|
||||||
|
])
|
||||||
|
end
|
||||||
|
|
||||||
|
Meta.strip_everything_not_covered()
|
||||||
|
end
|
|
@ -136,7 +136,10 @@ defmodule Pleroma.NotificationTest do
|
||||||
|
|
||||||
test "it disables notifications from followers" do
|
test "it disables notifications from followers" do
|
||||||
follower = insert(:user)
|
follower = insert(:user)
|
||||||
followed = insert(:user, notification_settings: %{"followers" => false})
|
|
||||||
|
followed =
|
||||||
|
insert(:user, notification_settings: %Pleroma.User.NotificationSetting{followers: false})
|
||||||
|
|
||||||
User.follow(follower, followed)
|
User.follow(follower, followed)
|
||||||
{:ok, activity} = CommonAPI.post(follower, %{"status" => "hey @#{followed.nickname}"})
|
{:ok, activity} = CommonAPI.post(follower, %{"status" => "hey @#{followed.nickname}"})
|
||||||
refute Notification.create_notification(activity, followed)
|
refute Notification.create_notification(activity, followed)
|
||||||
|
@ -144,13 +147,20 @@ defmodule Pleroma.NotificationTest do
|
||||||
|
|
||||||
test "it disables notifications from non-followers" do
|
test "it disables notifications from non-followers" do
|
||||||
follower = insert(:user)
|
follower = insert(:user)
|
||||||
followed = insert(:user, notification_settings: %{"non_followers" => false})
|
|
||||||
|
followed =
|
||||||
|
insert(:user,
|
||||||
|
notification_settings: %Pleroma.User.NotificationSetting{non_followers: false}
|
||||||
|
)
|
||||||
|
|
||||||
{:ok, activity} = CommonAPI.post(follower, %{"status" => "hey @#{followed.nickname}"})
|
{:ok, activity} = CommonAPI.post(follower, %{"status" => "hey @#{followed.nickname}"})
|
||||||
refute Notification.create_notification(activity, followed)
|
refute Notification.create_notification(activity, followed)
|
||||||
end
|
end
|
||||||
|
|
||||||
test "it disables notifications from people the user follows" do
|
test "it disables notifications from people the user follows" do
|
||||||
follower = insert(:user, notification_settings: %{"follows" => false})
|
follower =
|
||||||
|
insert(:user, notification_settings: %Pleroma.User.NotificationSetting{follows: false})
|
||||||
|
|
||||||
followed = insert(:user)
|
followed = insert(:user)
|
||||||
User.follow(follower, followed)
|
User.follow(follower, followed)
|
||||||
follower = Repo.get(User, follower.id)
|
follower = Repo.get(User, follower.id)
|
||||||
|
@ -159,7 +169,9 @@ defmodule Pleroma.NotificationTest do
|
||||||
end
|
end
|
||||||
|
|
||||||
test "it disables notifications from people the user does not follow" do
|
test "it disables notifications from people the user does not follow" do
|
||||||
follower = insert(:user, notification_settings: %{"non_follows" => false})
|
follower =
|
||||||
|
insert(:user, notification_settings: %Pleroma.User.NotificationSetting{non_follows: false})
|
||||||
|
|
||||||
followed = insert(:user)
|
followed = insert(:user)
|
||||||
{:ok, activity} = CommonAPI.post(followed, %{"status" => "hey @#{follower.nickname}"})
|
{:ok, activity} = CommonAPI.post(followed, %{"status" => "hey @#{follower.nickname}"})
|
||||||
refute Notification.create_notification(activity, follower)
|
refute Notification.create_notification(activity, follower)
|
||||||
|
|
|
@ -10,7 +10,8 @@ defmodule Pleroma.Builders.UserBuilder do
|
||||||
password_hash: Comeonin.Pbkdf2.hashpwsalt("test"),
|
password_hash: Comeonin.Pbkdf2.hashpwsalt("test"),
|
||||||
bio: "A tester.",
|
bio: "A tester.",
|
||||||
ap_id: "some id",
|
ap_id: "some id",
|
||||||
last_digest_emailed_at: NaiveDateTime.truncate(NaiveDateTime.utc_now(), :second)
|
last_digest_emailed_at: NaiveDateTime.truncate(NaiveDateTime.utc_now(), :second),
|
||||||
|
notification_settings: %Pleroma.User.NotificationSetting{}
|
||||||
}
|
}
|
||||||
|
|
||||||
Map.merge(user, data)
|
Map.merge(user, data)
|
||||||
|
|
|
@ -31,7 +31,8 @@ defmodule Pleroma.Factory do
|
||||||
nickname: sequence(:nickname, &"nick#{&1}"),
|
nickname: sequence(:nickname, &"nick#{&1}"),
|
||||||
password_hash: Comeonin.Pbkdf2.hashpwsalt("test"),
|
password_hash: Comeonin.Pbkdf2.hashpwsalt("test"),
|
||||||
bio: sequence(:bio, &"Tester Number #{&1}"),
|
bio: sequence(:bio, &"Tester Number #{&1}"),
|
||||||
last_digest_emailed_at: NaiveDateTime.utc_now()
|
last_digest_emailed_at: NaiveDateTime.utc_now(),
|
||||||
|
notification_settings: %Pleroma.User.NotificationSetting{}
|
||||||
}
|
}
|
||||||
|
|
||||||
%{
|
%{
|
||||||
|
|
21
test/user/notification_setting_test.exs
Normal file
21
test/user/notification_setting_test.exs
Normal file
|
@ -0,0 +1,21 @@
|
||||||
|
# Pleroma: A lightweight social networking server
|
||||||
|
# Copyright © 2017-2019 Pleroma Authors <https://pleroma.social/>
|
||||||
|
# SPDX-License-Identifier: AGPL-3.0-only
|
||||||
|
|
||||||
|
defmodule Pleroma.User.NotificationSettingTest do
|
||||||
|
use Pleroma.DataCase
|
||||||
|
|
||||||
|
alias Pleroma.User.NotificationSetting
|
||||||
|
|
||||||
|
describe "changeset/2" do
|
||||||
|
test "sets valid privacy option" do
|
||||||
|
changeset =
|
||||||
|
NotificationSetting.changeset(
|
||||||
|
%NotificationSetting{},
|
||||||
|
%{"privacy_option" => true}
|
||||||
|
)
|
||||||
|
|
||||||
|
assert %Ecto.Changeset{valid?: true} = changeset
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
|
@ -174,6 +174,7 @@ defmodule Pleroma.UserSearchTest do
|
||||||
|> Map.put(:search_rank, nil)
|
|> Map.put(:search_rank, nil)
|
||||||
|> Map.put(:search_type, nil)
|
|> Map.put(:search_type, nil)
|
||||||
|> Map.put(:last_digest_emailed_at, nil)
|
|> Map.put(:last_digest_emailed_at, nil)
|
||||||
|
|> Map.put(:notification_settings, nil)
|
||||||
|
|
||||||
assert user == expected
|
assert user == expected
|
||||||
end
|
end
|
||||||
|
|
|
@ -137,7 +137,8 @@ defmodule Pleroma.Web.MastodonAPI.NotificationControllerTest do
|
||||||
assert [%{"id" => ^notification3_id}, %{"id" => ^notification2_id}] = result
|
assert [%{"id" => ^notification3_id}, %{"id" => ^notification2_id}] = result
|
||||||
end
|
end
|
||||||
|
|
||||||
test "filters notifications using exclude_visibilities", %{conn: conn} do
|
describe "exclude_visibilities" do
|
||||||
|
test "filters notifications for mentions", %{conn: conn} do
|
||||||
user = insert(:user)
|
user = insert(:user)
|
||||||
other_user = insert(:user)
|
other_user = insert(:user)
|
||||||
|
|
||||||
|
@ -188,6 +189,101 @@ defmodule Pleroma.Web.MastodonAPI.NotificationControllerTest do
|
||||||
assert id == public_activity.id
|
assert id == public_activity.id
|
||||||
end
|
end
|
||||||
|
|
||||||
|
test "filters notifications for Like activities", %{conn: conn} do
|
||||||
|
user = insert(:user)
|
||||||
|
other_user = insert(:user)
|
||||||
|
|
||||||
|
{:ok, public_activity} =
|
||||||
|
CommonAPI.post(other_user, %{"status" => ".", "visibility" => "public"})
|
||||||
|
|
||||||
|
{:ok, direct_activity} =
|
||||||
|
CommonAPI.post(other_user, %{"status" => "@#{user.nickname}", "visibility" => "direct"})
|
||||||
|
|
||||||
|
{:ok, unlisted_activity} =
|
||||||
|
CommonAPI.post(other_user, %{"status" => ".", "visibility" => "unlisted"})
|
||||||
|
|
||||||
|
{:ok, private_activity} =
|
||||||
|
CommonAPI.post(other_user, %{"status" => ".", "visibility" => "private"})
|
||||||
|
|
||||||
|
{:ok, _, _} = CommonAPI.favorite(public_activity.id, user)
|
||||||
|
{:ok, _, _} = CommonAPI.favorite(direct_activity.id, user)
|
||||||
|
{:ok, _, _} = CommonAPI.favorite(unlisted_activity.id, user)
|
||||||
|
{:ok, _, _} = CommonAPI.favorite(private_activity.id, user)
|
||||||
|
|
||||||
|
activity_ids =
|
||||||
|
conn
|
||||||
|
|> assign(:user, other_user)
|
||||||
|
|> get("/api/v1/notifications", %{exclude_visibilities: ["direct"]})
|
||||||
|
|> json_response(200)
|
||||||
|
|> Enum.map(& &1["status"]["id"])
|
||||||
|
|
||||||
|
assert public_activity.id in activity_ids
|
||||||
|
assert unlisted_activity.id in activity_ids
|
||||||
|
assert private_activity.id in activity_ids
|
||||||
|
refute direct_activity.id in activity_ids
|
||||||
|
|
||||||
|
activity_ids =
|
||||||
|
conn
|
||||||
|
|> assign(:user, other_user)
|
||||||
|
|> get("/api/v1/notifications", %{exclude_visibilities: ["unlisted"]})
|
||||||
|
|> json_response(200)
|
||||||
|
|> Enum.map(& &1["status"]["id"])
|
||||||
|
|
||||||
|
assert public_activity.id in activity_ids
|
||||||
|
refute unlisted_activity.id in activity_ids
|
||||||
|
assert private_activity.id in activity_ids
|
||||||
|
assert direct_activity.id in activity_ids
|
||||||
|
|
||||||
|
activity_ids =
|
||||||
|
conn
|
||||||
|
|> assign(:user, other_user)
|
||||||
|
|> get("/api/v1/notifications", %{exclude_visibilities: ["private"]})
|
||||||
|
|> json_response(200)
|
||||||
|
|> Enum.map(& &1["status"]["id"])
|
||||||
|
|
||||||
|
assert public_activity.id in activity_ids
|
||||||
|
assert unlisted_activity.id in activity_ids
|
||||||
|
refute private_activity.id in activity_ids
|
||||||
|
assert direct_activity.id in activity_ids
|
||||||
|
|
||||||
|
activity_ids =
|
||||||
|
conn
|
||||||
|
|> assign(:user, other_user)
|
||||||
|
|> get("/api/v1/notifications", %{exclude_visibilities: ["public"]})
|
||||||
|
|> json_response(200)
|
||||||
|
|> Enum.map(& &1["status"]["id"])
|
||||||
|
|
||||||
|
refute public_activity.id in activity_ids
|
||||||
|
assert unlisted_activity.id in activity_ids
|
||||||
|
assert private_activity.id in activity_ids
|
||||||
|
assert direct_activity.id in activity_ids
|
||||||
|
end
|
||||||
|
|
||||||
|
test "filters notifications for Announce activities", %{conn: conn} do
|
||||||
|
user = insert(:user)
|
||||||
|
other_user = insert(:user)
|
||||||
|
|
||||||
|
{:ok, public_activity} =
|
||||||
|
CommonAPI.post(other_user, %{"status" => ".", "visibility" => "public"})
|
||||||
|
|
||||||
|
{:ok, unlisted_activity} =
|
||||||
|
CommonAPI.post(other_user, %{"status" => ".", "visibility" => "unlisted"})
|
||||||
|
|
||||||
|
{:ok, _, _} = CommonAPI.repeat(public_activity.id, user)
|
||||||
|
{:ok, _, _} = CommonAPI.repeat(unlisted_activity.id, user)
|
||||||
|
|
||||||
|
activity_ids =
|
||||||
|
conn
|
||||||
|
|> assign(:user, other_user)
|
||||||
|
|> get("/api/v1/notifications", %{exclude_visibilities: ["unlisted"]})
|
||||||
|
|> json_response(200)
|
||||||
|
|> Enum.map(& &1["status"]["id"])
|
||||||
|
|
||||||
|
assert public_activity.id in activity_ids
|
||||||
|
refute unlisted_activity.id in activity_ids
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
test "filters notifications using exclude_types", %{conn: conn} do
|
test "filters notifications using exclude_types", %{conn: conn} do
|
||||||
user = insert(:user)
|
user = insert(:user)
|
||||||
other_user = insert(:user)
|
other_user = insert(:user)
|
||||||
|
|
|
@ -92,13 +92,7 @@ defmodule Pleroma.Web.MastodonAPI.AccountViewTest do
|
||||||
test "Represent the user account for the account owner" do
|
test "Represent the user account for the account owner" do
|
||||||
user = insert(:user)
|
user = insert(:user)
|
||||||
|
|
||||||
notification_settings = %{
|
notification_settings = %Pleroma.User.NotificationSetting{}
|
||||||
"followers" => true,
|
|
||||||
"follows" => true,
|
|
||||||
"non_follows" => true,
|
|
||||||
"non_followers" => true
|
|
||||||
}
|
|
||||||
|
|
||||||
privacy = user.default_scope
|
privacy = user.default_scope
|
||||||
|
|
||||||
assert %{
|
assert %{
|
||||||
|
|
|
@ -6,6 +6,7 @@ defmodule Pleroma.Web.Push.ImplTest do
|
||||||
use Pleroma.DataCase
|
use Pleroma.DataCase
|
||||||
|
|
||||||
alias Pleroma.Object
|
alias Pleroma.Object
|
||||||
|
alias Pleroma.User
|
||||||
alias Pleroma.Web.CommonAPI
|
alias Pleroma.Web.CommonAPI
|
||||||
alias Pleroma.Web.Push.Impl
|
alias Pleroma.Web.Push.Impl
|
||||||
alias Pleroma.Web.Push.Subscription
|
alias Pleroma.Web.Push.Subscription
|
||||||
|
@ -182,4 +183,50 @@ defmodule Pleroma.Web.Push.ImplTest do
|
||||||
assert Impl.format_title(%{activity: activity}) ==
|
assert Impl.format_title(%{activity: activity}) ==
|
||||||
"New Direct Message"
|
"New Direct Message"
|
||||||
end
|
end
|
||||||
|
|
||||||
|
describe "build_content/3" do
|
||||||
|
test "returns info content for direct message with enabled privacy option" do
|
||||||
|
user = insert(:user, nickname: "Bob")
|
||||||
|
user2 = insert(:user, nickname: "Rob", notification_settings: %{privacy_option: true})
|
||||||
|
|
||||||
|
{:ok, activity} =
|
||||||
|
CommonAPI.post(user, %{
|
||||||
|
"visibility" => "direct",
|
||||||
|
"status" => "<Lorem ipsum dolor sit amet."
|
||||||
|
})
|
||||||
|
|
||||||
|
notif = insert(:notification, user: user2, activity: activity)
|
||||||
|
|
||||||
|
actor = User.get_cached_by_ap_id(notif.activity.data["actor"])
|
||||||
|
object = Object.normalize(activity)
|
||||||
|
|
||||||
|
assert Impl.build_content(notif, actor, object) == %{
|
||||||
|
body: "@Bob",
|
||||||
|
title: "New Direct Message"
|
||||||
|
}
|
||||||
|
end
|
||||||
|
|
||||||
|
test "returns regular content for direct message with disabled privacy option" do
|
||||||
|
user = insert(:user, nickname: "Bob")
|
||||||
|
user2 = insert(:user, nickname: "Rob", notification_settings: %{privacy_option: false})
|
||||||
|
|
||||||
|
{:ok, activity} =
|
||||||
|
CommonAPI.post(user, %{
|
||||||
|
"visibility" => "direct",
|
||||||
|
"status" =>
|
||||||
|
"<span>Lorem ipsum dolor sit amet</span>, consectetur :firefox: adipiscing elit. Fusce sagittis finibus turpis."
|
||||||
|
})
|
||||||
|
|
||||||
|
notif = insert(:notification, user: user2, activity: activity)
|
||||||
|
|
||||||
|
actor = User.get_cached_by_ap_id(notif.activity.data["actor"])
|
||||||
|
object = Object.normalize(activity)
|
||||||
|
|
||||||
|
assert Impl.build_content(notif, actor, object) == %{
|
||||||
|
body:
|
||||||
|
"@Bob: Lorem ipsum dolor sit amet, consectetur adipiscing elit. Fusce sagittis fini...",
|
||||||
|
title: "New Direct Message"
|
||||||
|
}
|
||||||
|
end
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -159,11 +159,31 @@ defmodule Pleroma.Web.TwitterAPI.UtilControllerTest do
|
||||||
|
|
||||||
user = Repo.get(User, user.id)
|
user = Repo.get(User, user.id)
|
||||||
|
|
||||||
assert %{
|
assert %Pleroma.User.NotificationSetting{
|
||||||
"followers" => false,
|
followers: false,
|
||||||
"follows" => true,
|
follows: true,
|
||||||
"non_follows" => true,
|
non_follows: true,
|
||||||
"non_followers" => true
|
non_followers: true,
|
||||||
|
privacy_option: false
|
||||||
|
} == user.notification_settings
|
||||||
|
end
|
||||||
|
|
||||||
|
test "it update notificatin privacy option", %{conn: conn} do
|
||||||
|
user = insert(:user)
|
||||||
|
|
||||||
|
conn
|
||||||
|
|> assign(:user, user)
|
||||||
|
|> put("/api/pleroma/notification_settings", %{"privacy_option" => "1"})
|
||||||
|
|> json_response(:ok)
|
||||||
|
|
||||||
|
user = refresh_record(user)
|
||||||
|
|
||||||
|
assert %Pleroma.User.NotificationSetting{
|
||||||
|
followers: true,
|
||||||
|
follows: true,
|
||||||
|
non_follows: true,
|
||||||
|
non_followers: true,
|
||||||
|
privacy_option: true
|
||||||
} == user.notification_settings
|
} == user.notification_settings
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in a new issue