Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into websearch

diff --cc CHANGELOG.md
index 8b41e22726999ee96e0157166cd4ed34b4b90573,fc4013fc3358e766c0d6effb6843dfc8cc5e190c..a682036f404cb362c126bf58a94aa2a8c7f2af24
--- 1/CHANGELOG.md
--- 2/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -22,7 -21,7 +22,8 @@@ The format is based on [Keep a Changelo
  - Configuration: Add `:instance, autofollowing_nicknames` setting to provide a way to make accounts automatically follow new users that register on the local Pleroma instance.
  - Ability to view remote timelines, with ex. `/api/v1/timelines/public?instance=lain.com` and streams `public:remote` and `public:remote:media`.
  - The site title is now injected as a `title` tag like preloads or metadata.
+ - Password reset tokens now are not accepted after a certain age.
 +- Added a configuration option to use the postgresql `websearch` function for more complicated search queries.
  
  <details>
    <summary>API Changes</summary>

diff --cc config/config.exs
index 47eb184425e15d253ebb02a2ed6224534f9be412,be52576631b33e38c2cb4a75cc8b24d614c11687..8d054570426d1c4e2b98d5e9c67bd42977e825a4
--- 1/config/config.exs
--- 2/config/config.exs
+++ b/config/config.exs
@@@ -264,7 -264,7 +264,8 @@@ config :pleroma, :instance
      ]
    ],
    show_reactions: true,
 -  password_reset_token_validity: 60 * 60 * 24
++  password_reset_token_validity: 60 * 60 * 24,
 +  search_function: :websearch
  
  config :pleroma, :welcome,
    direct_message: [

diff --cc docs/configuration/cheatsheet.md
index fa59a27e332d117dd060a6c540138a30d3eb8903,85551362cedd64b84ceb1284609fdd07381ad27e..1b321d103cc331654f4fec12768442974bd7b197
--- 1/docs/configuration/cheatsheet.md
--- 2/docs/configuration/cheatsheet.md
+++ b/docs/configuration/cheatsheet.md
@@@ -63,7 -63,7 +63,8 @@@ To add configuration to your config fil
  * `external_user_synchronization`: Enabling following/followers counters synchronization for external users.
  * `cleanup_attachments`: Remove attachments along with statuses. Does not affect duplicate files and attachments without status. Enabling this will increase load to database when deleting statuses on larger instances.
  * `show_reactions`: Let favourites and emoji reactions be viewed through the API (default: `true`).
+ * `password_reset_token_validity`: The time after which reset tokens aren't accepted anymore, in seconds (default: one day).
 +* `search_function`: What search function to use for fulltext search. Possible values are `:websearch` and `:plain`. `:websearch` enables more complex search queries, but requires at least PostgreSQL 11. (default: `websearch`)
  
  ## Welcome
  * `direct_message`: - welcome message sent as a direct message.

diff --cc lib/pleroma/activity/search.ex
Simple merge