bigbuffet/pleroma
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
15125 commits 1 branch 0 tags 292 MiB
Commit graph

9040 commits

Author SHA1 Message Date
Tusooa Zhu
fe2d4778ee
Expose content type of status sources 2022-06-04 12:57:30 -04:00
Tusooa Zhu
3249ac1f12
Show edited_at in MastodonAPI/show 2022-06-03 21:47:40 -04:00
Tusooa Zhu
8bac8147d4
Stream out edits 2022-06-03 21:15:17 -04:00
Tusooa Zhu
fa31ae50e6
Inject history when object is refetched 2022-06-01 19:49:04 -04:00
Tusooa Zhu
410e177b2a
Strip internal fields in formerRepresentation 2022-06-01 12:02:03 -04:00
Tusooa Zhu
b613a9ec6b
Implement mastodon api for editing status 2022-05-31 14:32:28 -04:00
Pierre-Louis Bonicoli
a158774364
hackney adapter helper & reverse proxy client: enable TLSv1.3 
The list of TLS versions was added by
8bd2b6eb13 when hackney version was
pinned to 1.15.2. Later hackney version was upgraded
(166455c884) but the list of TLS
versions wasn't removed. From the hackney point of view, this list has
been replaced by the OTP defaults since 0.16.0
(734694ea4e24f267864c459a2f050e943adc6694).

It looks like the same issue already occurred before:
0cb7b0ea84.

A way to test this issue (where example.com is an ActivityPub site
which uses TLSv1.3 only):

   $ PLEROMA_CONFIG_PATH=/path/to/config.exs pleroma start_iex
   Erlang/OTP 22 [erts-10.7.2.16] [source] [64-bit] [smp:2:2] [ds:2:2:10] [async-threads:1] [hipe]

   Erlang/OTP 22 [erts-10.7.2.16] [source] [64-bit] [smp:2:2] [ds:2:2:10] [async-threads:1] [hipe]

   Interactive Elixir (1.10.4) - press Ctrl+C to exit (type h() ENTER for help)
   iex(pleroma@127.0.0.1)2> Pleroma.Object.Fetcher.fetch_and_contain_remote_object_from_id("https://example.com/@/Nick/")
   {:error,
    {:tls_alert,
     {:protocol_version,
      'TLS client: In state hello received SERVER ALERT: Fatal - Protocol Version\n'}}}

With this patch, the output is the expected one:

   iex(pleroma@127.0.0.1)3> Pleroma.Object.Fetcher.fetch_and_contain_remote_object_from_id("https://example.com/@/Nick/")
   {:error,
   {:ok,
    %{
      "@context" => [
        "https://www.w3.org/ns/activitystreams",
        "https://w3id.org/security/v1",
        %{
          "Emoji" => "toot:Emoji",
          "Hashtag" => "as:Hashtag",
          "atomUri" => "ostatus:atomUri",
          "conversation" => "ostatus:conversation",
          "featured" => "toot:featured",
          "focalPoint" => %{"@container" => "@list", "@id" => "toot:focalPoint"},
          "inReplyToAtomUri" => "ostatus:inReplyToAtomUri",
          "manuallyApprovesFollowers" => "as:manuallyApprovesFollowers",
          "movedTo" => "as:movedTo",
          "ostatus" => "http://ostatus.org#",
          "sensitive" => "as:sensitive",
          "toot" => "http://joinmastodon.org/ns#"
        }
      ],
      "endpoints" => %{"sharedInbox" => "https://example.com/inbox"},
      "followers" => "https://example.com/@/Nick/followers",
      "following" => nil,
      "icon" => %{
        "type" => "Image",
        "url" => "https://example.com/static/media/[...].png"
      },
      "id" => "https://example.com/@/Nick/",
      "inbox" => "https://example.com/@/Nick/inbox",
      "liked" => nil,
      "name" => "Nick",
      "outbox" => "https://example.com/@/Nick/outbox",
      "preferredUsername" => "Nick",
      "publicKey" => %{
        "id" => "https://example.com/@/Nick/#main-key",
        "owner" => "https://example.com/@/Nick/",
        "publicKeyPem" => "[...]
      },
      "summary" => "",
      "type" => "Person",
      "url" => "https://example.com/@/Nick/"
    }}

A way to test the reverse proxy bits of this issue (where example.com allows TLSv1.3 only):

    iex(pleroma@127.0.0.1)1> Pleroma.ReverseProxy.Client.Hackney.request("GET", "https://example.com", [], [])
    {:error,
     {:tls_alert,
      {:protocol_version,
       'TLS client: In state hello received SERVER ALERT: Fatal - Protocol Version\n'}}}
 2022-05-31 00:51:45 +02:00
Tusooa Zhu
393b508846
Implement viewing source 2022-05-30 00:59:23 -04:00
Tusooa Zhu
c004eb0fa2
Implement mastodon api for showing edit history 2022-05-29 23:50:31 -04:00
Tusooa Zhu
8acfe95f3e
Allow updating polls 2022-05-29 22:16:03 -04:00
Tusooa Zhu
5e8aac0e07
Record edit history for Note and Question Updates 2022-05-29 13:54:16 -04:00
Tusooa Zhu
0f6a5eb9a2
Handle Note and Question Updates 2022-05-29 12:54:57 -04:00
Tusooa Zhu
547def67a7
Allow Updates by every actor on the same origin 2022-05-29 11:36:00 -04:00
marcin mikołajczak
0fbe33b4aa Add tests 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-05-27 15:45:42 +02:00
marcin mikołajczak
cd13b92a3b Add index for quoteUrl 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-05-27 13:52:28 +02:00
marcin mikołajczak
8d1617f439 Add a route for status quotes 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-05-27 13:51:22 +02:00
marcin mikołajczak
75c8036d2c Count post quotes 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-05-26 22:42:43 +02:00
NEETzsche
880a2a7a27 Don't create messages for deactivated blockers 2022-05-23 21:49:21 +00:00
duponin
5ca1ac041f BBS: add repeat functionality 2022-05-22 03:19:24 +02:00
duponin
5951d637a9 BBS: show post ID when posted 2022-05-22 02:40:56 +02:00
duponin
fffd9059d6 BBS: add post favourite feature 2022-05-22 02:39:56 +02:00
Hélène
a4659d993d Apply Hélène suggestions 2022-05-21 23:23:55 +00:00
duponin
e3e8ff06f9 BBS: mark notification as read 2022-05-21 05:10:48 +02:00
duponin
c04c7f9e45 BBS: show notifactions 2022-05-21 05:10:22 +02:00
duponin
33ced2c2ed BBS: put a new line for each HTML break in an activity 
Otherwise it would just put each line on the first one, which is not
really readable
 2022-05-21 04:17:34 +02:00
marcin mikołajczak
a3ea2bdbc2 Merge remote-tracking branch 'soapbox/develop' into webfinger-expanding 2022-05-20 11:44:49 +02:00
duponin
b128e1d6c5 decode HTML to be human readable in BBS 2022-05-19 01:38:13 +02:00
duponin
5086d6d5e9 add thread show in BBS frontend 2022-05-19 00:56:20 +02:00
Hélène
a74ce2d77a
StealEmojiPolicy: fix String rejected_shortcodes 
* rejected_shortcodes is defined as a list of strings in the
  configuration description. As such, database-based configuration was
  led to handle those settings as strings, and not as the actually
  expected type, Regex.
* This caused each message passing through this MRF, if a rejected
  shortcode was set and the emoji did not exist already on the instance,
  to fail federating, as an exception was raised, swiftly caught and
  mostly silenced.
* This commit fixes the issue by introducing new behavior: strings are
  now handled as perfect matches for an emoji shortcode (meaning that if
  the emoji-to-be-pulled's shortcode is in the blacklist, it will be
  rejected), while still supporting Regex types as before.
 2022-05-18 21:25:10 +02:00
duponin
39c47073a3 fix Ctrl-c catch on SSH BBS 2022-05-18 20:06:16 +02:00
Alex Gleason
e13f64bd8e
Merge remote-tracking branch 'pleroma/develop' into merge-upstream 2022-05-17 11:19:29 -05:00
marcin mikołajczak
7cbca9d18d MastodonAPI.Admin.AccountView: show registration reason 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-05-15 22:52:08 +02:00
marcin mikołajczak
745e1663ac i'm bad at copy-paste 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-05-15 19:15:36 +02:00
Tusooa Zhu
f1722a9f4a
Make lint happy 
Ref: fix-local-public
 2022-05-09 18:53:32 -04:00
Tusooa Zhu
38444aa92a
Allow authenticated users to access local-only posts in MastoAPI 
Ref: fix-local-public
 2022-05-09 18:53:18 -04:00
Haelwenn
4605efe272 Merge branch 'improve_anti_followbot_policy' into 'develop' 
Also use actor_type to determine if an account is a bot in antiFollowbotPolicy

Closes #2561

See merge request pleroma/pleroma!3498
 2022-05-08 18:10:40 +00:00
Ilja
a8093732bd Also use actor_type to determine if an account is a bot in antiFollowbotPolicy 2022-05-08 18:10:40 +00:00
Tusooa Zhu
221cb3fb81
Allow users to create backups without providing email address 
Ref: backup-without-email
 2022-05-07 00:23:55 -04:00
Tusooa Zhu
fe933b9bf2
Prevent remote access of local-only posts via /objects 
Ref: fix-local-public
 2022-05-06 13:54:21 -04:00
Tusooa Zhu
466568ae36
Lint 
Ref: fix-local-public
 2022-05-06 13:54:13 -04:00
Tusooa Zhu
826deb7375
Make local-only statuses searchable 
Ref: fix-local-public
 2022-05-06 13:54:13 -04:00
Tusooa Zhu
c48be59f58
Show local-only statuses in public timeline for authenticated users 
Ref: fix-local-public
 2022-05-06 13:54:02 -04:00
Tusooa Zhu
57c030a0a7 Skip cache when /objects or /activities is authenticated 
Ref: fix-local-public
 2022-05-06 10:23:26 +02:00
Tusooa Zhu
e2d24eda57 Allow to skip cache in Cache plug 
Ref: fix-local-public
 2022-05-06 10:23:26 +02:00
Tusooa Zhu
fa3157df96 Skip cache when /objects or /activities is authenticated 
Ref: fix-local-public
 2022-05-06 08:44:03 +02:00
Tusooa Zhu
4d482b765f Allow to skip cache in Cache plug 
Ref: fix-local-public
 2022-05-06 08:39:42 +02:00
Alex Gleason
5ae5072c2e Merge branch 'rules-strings' into 'develop' 
Represent rule IDs as strings

See merge request soapbox-pub/soapbox-be!127
 2022-05-02 19:36:45 +00:00
Alex Gleason
5b97fcb566
Represent rule IDs as strings 2022-05-02 14:16:03 -05:00
marcin mikołajczak
cfb9efd47c Merge remote-tracking branch 'soapbox/develop' into webfinger-expanding 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-05-01 21:55:19 +02:00
marcin mikołajczak
50d3590137 restyle static pages 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-04-30 23:24:25 +02:00
NEETzsche
32b096e7ce Remove superfluous invocation of Logger 2022-04-24 13:41:00 -06:00
Tusooa Zhu
be08d9305b
Fix incorrect fallback when English is set to first language 2022-04-17 22:39:52 -04:00
marcin mikołajczak
a0eb48b785 Merge remote-tracking branch 'soapbox/develop' into status-notification-type 2022-04-14 20:15:21 +02:00
Tusooa Zhu
7d1dae3bef
Restrict mastodon api announcements to logged-in users only 2022-04-02 02:25:13 -04:00
Alex Gleason
30ea5e927c Merge branch 'short_description' into 'develop' 
Add short_description field

See merge request soapbox-pub/soapbox-be!121
 2022-03-29 13:19:45 +00:00
marcin mikołajczak
fbf9eced11 Add short_description field 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-03-29 14:04:27 +02:00
marcin mikołajczak
6500965fb3 Add short_description field 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-03-29 14:01:03 +02:00
marcin mikołajczak
ae2646453b Add /@:nickname route, redirect /users/:nickname.rss to /users/:nickname/feed.rss instead of .atom 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-03-28 22:26:55 +02:00
Alex Gleason
fc25b626da Merge branch 'merge-upstream' into 'develop' 
Merge upstream

See merge request soapbox-pub/soapbox-be!108
 2022-03-23 20:37:40 +00:00
marcin mikołajczak
7bc95acca0 Add "status" notification type 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-03-22 20:29:28 +01:00
Haelwenn
d7c53da77a Merge branch 'from/upstream-develop/tusooa/translate-pages' into 'develop' 
Translate backend-rendered pages

See merge request pleroma/pleroma!3634
 2022-03-20 18:14:37 +00:00
Haelwenn
b76340511d Merge branch 'delete_report_notifs_when_demoting_from_superuser' into 'develop' 
Delete report notifs when demoting from superuser

Closes #2840

See merge request pleroma/pleroma!3642
 2022-03-20 18:13:19 +00:00
Tusooa Zhu
0c78ab4a88
Use utc_datetime in db schema 2022-03-18 11:17:22 -04:00
Haelwenn (lanodan) Monnier
83338c25a5 Transmogrifier: Use validating regex for "mediaType" 2022-03-17 22:37:26 +01:00
Haelwenn (lanodan) Monnier
030183b35f AttachmentValidator: Use custom ecto type and regex for "mediaType" 2022-03-17 22:37:26 +01:00
Haelwenn (lanodan) Monnier
4ea9886faa EctoType: Add MIME validator 2022-03-17 22:37:26 +01:00
Alex Gleason
d7cbaedc86 Merge branch 'fix-attachments' into 'develop' 
StatusController: deleting a status returns the original media IDs

See merge request soapbox-pub/soapbox-be!114
 2022-03-17 18:58:19 +00:00
Alex Gleason
552525e954 Merge branch 'notification-types' into 'develop' 
MastoAPI: Use `types` for filtering notifications

See merge request soapbox-pub/soapbox-be!113
 2022-03-17 18:57:49 +00:00
Alex Gleason
a6598128ca
StatusController: deleting a status returns the original media IDs 2022-03-16 18:13:35 -05:00
marcin mikołajczak
f572a416e7 Use types for filtering notifications 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-03-16 21:16:03 +01:00
marcin mikołajczak
31ff467eff Use types for filtering notifications 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-03-16 21:15:44 +01:00
marcin mikołajczak
ffe081bf44 Use reject_follow_request 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-03-16 19:18:15 +01:00
marcin mikołajczak
eb35a54ab8 Use reject_follow_request 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-03-16 19:15:58 +01:00
marcin mikołajczak
6754d1f272 POST /api/v1/accounts/:id/remove_from_followers 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-03-16 16:52:33 +01:00
marcin mikołajczak
8157013f0b POST /api/v1/accounts/:id/remove_from_followers 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-03-16 16:52:09 +01:00
marcin mikołajczak
d76bfd4e89 Location: user_location_length 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-03-14 22:52:06 +01:00
marcin mikołajczak
4c56e0fceb Support account location field 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-03-14 22:41:33 +01:00
marcin mikołajczak
212080c3e8 Store status content mime type in the object 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-03-13 20:20:39 +01:00
Alex Gleason
b56b0fb4e9
Merge remote-tracking branch 'pleroma/develop' into merge-upstream 2022-03-09 16:34:57 -06:00
Tusooa Zhu
ebcda5265b
Format announcements into html 2022-03-08 23:00:51 -05:00
Tusooa Zhu
eb1a29640f
Add pagination to AdminAPI.AnnouncementController.index 2022-03-08 21:26:05 -05:00
Tusooa Zhu
11a1996bf5
Implement update announcement admin api 2022-03-08 20:55:41 -05:00
Tusooa Zhu
881179ec72
Remove GET /api/v1/announcements/:id 2022-03-08 19:22:28 -05:00
Tusooa Zhu
d569694ae9
Show only visible announcements in MastodonAPI 2022-03-08 19:20:29 -05:00
Tusooa Zhu
cf8334dbc1
Add starts_at, ends_at and all_day parameters 2022-03-08 19:12:01 -05:00
Tusooa Zhu
fcf3c9057e
Implement visibility filtering for announcements 2022-03-08 18:21:20 -05:00
Tusooa Zhu
009817c9ee
Correct docstring for AnnouncementController.show 2022-03-08 17:00:49 -05:00
Tusooa Zhu
2b39b36e49
Implement POST /api/v1/announcements/:id/dismiss 2022-03-08 16:59:20 -05:00
Tusooa Zhu
aa1fff279e
Implement GET /api/v1/announcements/:id 2022-03-08 16:19:35 -05:00
Tusooa Zhu
5169ad8f14
Implement announcement read relationships 2022-03-08 13:09:49 -05:00
Tusooa Zhu
c867d23250
Fill properties of announcements from Mastodon API spec 2022-03-08 09:35:35 -05:00
Tusooa Zhu
d7af67012f
Implement first pass of announcement admin api 
CCBUG: https://git.pleroma.social/pleroma/pleroma/-/issues/2836
CCBUG: https://git.pleroma.social/pleroma/pleroma/-/issues/1470
 2022-03-08 01:01:27 -05:00
Ilja
cdc5bbe836 After code review 
Use patern matching to see if someone was superuser before
 2022-03-07 14:00:42 +01:00
Tusooa Zhu
79ccb6b999
Support fallbacking to other languages 2022-03-06 11:43:31 -05:00
Ilja
89667189b8 Delete report notifs when demoting from superuser 
When someone isn't a superuser any more, they shouldn't see the reporsts any more either.
Here we delete the report notifications from a user when that user gets updated from being a superuser to a non-superuser.
 2022-03-06 17:36:30 +01:00
marcin mikołajczak
0250367bb5 Correctly order rules by id/creation date 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-03-05 21:45:38 +01:00
Tusooa Zhu
cd42e2bed0
Lint 2022-03-03 09:49:55 -05:00
Tusooa Zhu
aca11fb70e
Support multiple locales from userLanguage cookie 2022-03-03 02:31:36 -05:00
Tusooa Zhu
7ea330b4fe
Support multiple locales formally 
elixir gettext current does not fully support fallback to another language [0].
But it might in the future. We adapt it so that all languages in Accept-Language
headers are received by Pleroma.Web.Gettext. User.languages is now a comma-separated
list.

[0]: https://github.com/elixir-gettext/gettext/issues/303
 2022-03-03 02:03:44 -05:00
Tusooa Zhu
d3f3f30c6a
Make lint happy 2022-03-02 22:56:19 -05:00
Tusooa Zhu
8de573b047
Fallback to a variant if the language in general is not supported 
For an example, here, zh is not supported, but zh_Hans and zh_Hant
are. If the user asks for zh, we should choose a variant for them
instead of fallbacking to default.

Some browsers (e.g. Firefox) does not allow users to customize
their language codes. For example, there is no zh-Hans, but only
zh, zh-CN, zh-TW, zh-HK, etc. This provides a workaround for
those users suffering from bad design decisions.
 2022-03-02 19:59:11 -05:00
marcin mikołajczak
97d014552d Update assign_account_operation 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-03-02 17:21:21 +01:00
marcin mikołajczak
dcdb6a9f97 Merge remote-tracking branch 'soapbox/develop' into report-assign-account 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-03-02 16:34:13 +01:00
marcin mikołajczak
266ed48d93 add tests 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-03-02 15:25:00 +01:00
Tusooa Zhu
e644f8dea5
Allow user to register with custom language 2022-03-02 01:41:13 -05:00
Tusooa Zhu
396f036b13
Allow update_credentials to update User.language 2022-03-02 00:58:02 -05:00
Tusooa Zhu
0149ea4538
Send emails i18n'd using backend-stored user language 2022-03-01 22:19:13 -05:00
Tusooa Zhu
af82f09ce3
Make all emails translatable 2022-03-01 20:45:59 -05:00
Tusooa Zhu
1deab33fb0
Make mail and mailer translatable 2022-03-01 19:17:11 -05:00
Tusooa Zhu
32e4aa42d3
Make static fe translatable 2022-03-01 18:48:08 -05:00
Alex Gleason
c34b232d80 Merge branch 'report-rules' into 'develop' 
Allow submitting an array of rule_ids to /api/v1/reports

See merge request soapbox-pub/soapbox-be!101
 2022-03-01 23:04:24 +00:00
Alex Gleason
1db95a1677
SideEffects: don't stream Create/ChatMessage in an 'update' event 2022-02-28 14:56:20 -06:00
Tusooa Zhu
fdbf9b06e5
Fix tests 2022-02-28 11:23:15 -05:00
Tusooa Zhu
cadca083ea
Make mfa pages translatable 2022-02-28 11:07:28 -05:00
Tusooa Zhu
50a316cd63
Make oauth pages translatable 2022-02-28 02:11:57 -05:00
Tusooa Zhu
f63d9b7835
Use proper lang attributes in htmls 2022-02-28 01:28:23 -05:00
Tusooa Zhu
0cc6557716
Make tag feed translatable 2022-02-28 01:13:39 -05:00
Tusooa Zhu
1edbda39e1
Make password reset pages translatable 2022-02-28 01:04:04 -05:00
HJ
ee05abe052 Merge branch 'revert/notice-routes' into 'develop' 
Revert notice compatibility routes merge request

See merge request pleroma/pleroma!3576
 2022-02-26 16:24:49 +00:00
Sean King
17aa3644be
Copyright bump for 2022 2022-02-25 23:11:42 -07:00
Alex Gleason
4bdd365b6f Merge branch 'merge-upstream' into 'develop' 
Add unicode 14 support

See merge request soapbox-pub/soapbox-be!102
 2022-02-24 17:42:46 +00:00
Alex Gleason
16745b8e91
Merge remote-tracking branch 'pleroma/develop' into merge-upstream 2022-02-24 12:28:23 -05:00
Tusooa Zhu
9f4c5743e8
Make lint happy 2022-02-21 19:12:32 -05:00
Tusooa Zhu
a867107437
Make remote follow pages translatable 2022-02-21 18:43:45 -05:00
Tusooa Zhu
0fd3695b9c
Prefer userLanguage cookie over Accept-Language header in detecting locale 
https://git.pleroma.social/pleroma/pleroma-meta/-/issues/60
 2022-02-21 18:02:19 -05:00
Sam Therapy
061cb749cd
Add unicode 14 support 
and add a test with a unicode 14 emoji
 2022-02-21 12:28:33 -06:00
marcin mikołajczak
644b7e614e Allow submitting an array of rule_ids to /api/v1/reports 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-02-21 13:37:13 +01:00
marcin mikołajczak
9747233375 Add mastodon admin API routes for report assigning 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-02-18 18:06:24 +01:00
marcin mikołajczak
db77571319 Merge remote-tracking branch 'soapbox/develop' into report-assign-account 2022-02-18 17:25:52 +01:00
marcin mikołajczak
05fb8229b9 Allow assigning users to reports 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-02-18 17:23:57 +01:00
marcin mikołajczak
e4677e212c Merge remote-tracking branch 'soapbox/develop' into mastodon-admin-api 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-02-17 15:28:25 +01:00
Alex Gleason
0a6c52fecb Merge branch 'configuration' into 'develop' 
Add `configuration` field to /api/v1/instance

See merge request soapbox-pub/soapbox-be!98
 2022-02-16 20:24:48 +00:00
marcin mikołajczak
892f75e9d7 InstanceControllerTest: Add configuration test 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-02-16 20:41:36 +01:00
marcin mikołajczak
02f02cb6df Add configuration field to /api/v1/instance 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-02-15 22:03:49 +01:00
marcin mikołajczak
fbb159dd47 Merge remote-tracking branch 'tusooa/from/develop/tusooa/emit-move' into emit-move 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-02-13 23:18:55 +01:00
marcin mikołajczak
7f62c0b74c Merge remote-tracking branch 'origin/feature/1469-webfinger-expanding' into webfinger-expanding 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-02-13 23:09:57 +01:00
marcin mikołajczak
5a4a7e775b some cleanup, reports 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-02-13 17:58:24 +01:00
marcin mikołajczak
ca5ee8f0bf MastoAPI: /api/v1/admin/reports 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-02-12 21:52:21 +01:00
marcin mikołajczak
48e87be7de Merge remote-tracking branch 'soapbox/develop' into mastodon-admin-api 2022-02-11 22:53:22 +01:00
marcin mikołajczak
6836361398 MastoAPI: /api/v1/admin/accounts 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-02-11 22:36:00 +01:00
marcin mikołajczak
a80852ba05 Merge branch 'instance-rules' into 'develop' 
Instance rules

See merge request soapbox-pub/soapbox!93
 2022-02-08 19:20:44 +00:00
marcin mikołajczak
1ffed59ae9 Instance rules: Use render_many 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-02-07 23:41:41 +01:00
Alex Gleason
502b63d8ea
Merge remote-tracking branch 'pleroma/develop' into merge-upstream 2022-02-06 12:31:53 -06:00
marcin mikołajczak
e473bcf7a0 Max media attachment count 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-02-06 17:41:15 +01:00
marcin mikołajczak
d8a817ae8e Add GET /api/v1/instance/rules 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-02-05 19:13:30 +01:00
marcin mikołajczak
6d18e6595c Instance rules 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-02-05 18:07:04 +01:00
Alex Gleason
a87b7b3046
Merge remote-tracking branch 'pleroma/develop' into merge-upstream 2022-02-01 09:31:58 -06:00
marcin mikołajczak
f8f2a17754 Birthdays: Fix outgoing federation of birth dates 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-02-01 12:00:26 +01:00
Alex Gleason
93f5cd5c3b
Merge remote-tracking branch 'pleroma/quote-post' into merge-upstream 2022-01-30 10:58:18 -06:00
Alex Gleason
643f78cb22
InlineQuotePolicy: skip objects which already have an .inline-quote span 2022-01-30 10:57:29 -06:00
Alex Gleason
deff42f034
Merge remote-tracking branch 'origin/develop' into quote-post 2022-01-30 10:50:35 -06:00
Alex Gleason
dde02e9806
Merge remote-tracking branch 'pleroma/quote-post' into merge-upstream 2022-01-28 17:53:56 -06:00
Alex Gleason
4883b996ad
Actually, don't send _misskey_quote anymore 2022-01-28 17:53:19 -06:00
Alex Gleason
281ccab704
Merge remote-tracking branch 'pleroma/quote-post' into merge-upstream 2022-01-28 16:21:37 -06:00
Alex Gleason
108997b764
InlineQuotePolicy: improve the way Markdown quotes are displayed by other software 2022-01-28 16:07:17 -06:00
Alex Gleason
b73a53ec69
Handle Fedibird's new quoteUri field 2022-01-28 15:55:52 -06:00
Alex Gleason
ac3426cbca
Transmogrifier: federate quotes with _misskey_quote field 2022-01-28 14:06:32 -06:00
Alex Gleason
ac6b2fadcf
Merge remote-tracking branch 'pleroma/quote-post' into merge-upstream 2022-01-28 12:34:34 -06:00
Alex Gleason
5134e691f4
StatusView: return quote post inside a reblog 2022-01-28 12:33:55 -06:00
Alex Gleason
a4d8e2bef7
Merge remote-tracking branch 'pleroma/quote-post' into merge-upstream 2022-01-27 14:31:04 -06:00
Alex Gleason
8d2f370a51
Merge remote-tracking branch 'pleroma/mention-mrf-md' into merge-upstream 2022-01-27 14:30:57 -06:00
Alex Gleason
087e060d30
InlineQuotePolicy: don't add line breaks to markdown posts 2022-01-27 14:28:06 -06:00
Alex Gleason
3bf257171f
ForceMentionsInContent: improve display of Markdown posts 2022-01-27 14:15:06 -06:00
Alex Gleason
436f62781b
Merge remote-tracking branch 'pleroma/mentions-mrf-replies-only' into merge-upstream 2022-01-26 21:29:17 -06:00
Alex Gleason
392306a4fc
Merge remote-tracking branch 'pleroma/develop' into merge-upstream 2022-01-26 21:29:05 -06:00
Alex Gleason
27cb3d6273
ForceMentionsInContent: don't apply it to top-level posts 2022-01-26 21:24:26 -06:00
bot
a4de79ced0 ForceBotUnlistedPolicy: fix to stop unlisting my posts >:( 2022-01-26 22:53:02 +00:00
Alex Gleason
f73edd02f0
Merge remote-tracking branch 'pleroma/quote-post' into quote-visibility-fixes 2022-01-26 11:59:55 -06:00
Alex Gleason
91822c383c
StatusView: add quote_visible param 2022-01-26 11:52:50 -06:00
Alex Gleason
660490c2ec
StatusView: fix quote visibility 2022-01-26 11:49:31 -06:00
Alex Gleason
5a1fa6bca2
CommonAPI: disallow quoting private posts through the API 2022-01-26 11:21:49 -06:00
Alex Gleason
f0c22f9bd7
Merge remote-tracking branch 'pleroma/inline-mention-self' into inline-mention-self 2022-01-25 12:36:56 -06:00
Alex Gleason
0604b0dd09
ForceMentionsInContent: don't mention self 2022-01-25 12:33:47 -06:00
Alex Gleason
93a340668f
Merge remote-tracking branch 'origin/develop' into quote-post 2022-01-25 11:57:04 -06:00
Alex Gleason
0f4e0e667e Merge branch 'recipients-inline' into 'develop' 
ForceMentionsInContent: wrap mentions in a span, fix the formatting

See merge request pleroma/pleroma!3620
 2022-01-25 17:43:39 +00:00
Alex Gleason
1e740bf6d3
Merge remote-tracking branch 'pleroma/recipients-inline' into merge-upstream 2022-01-25 11:02:07 -06:00
Alex Gleason
440754d526
Merge remote-tracking branch 'pleroma/develop' into merge-upstream 2022-01-25 11:01:59 -06:00
Alex Gleason
99e9c2c668 Merge branch 'birth-dates' into 'develop' 
Fix show_birthday

See merge request pleroma/pleroma!3621
 2022-01-25 16:59:07 +00:00
Alex Gleason
65b4d2ce84
ForceMentionsInContent: fix order of mentions 2022-01-25 10:42:34 -06:00
marcin mikołajczak
ab12a05a43 AccountView: Add test for show_birthday 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-01-25 17:34:36 +01:00
marcin mikołajczak
c1ae35ff2c Fix show_birthday 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-01-25 17:04:41 +01:00
Alex Gleason
25786c804b
Merge remote-tracking branch 'pleroma/develop' into merge-upstream 2022-01-25 09:39:25 -06:00
Alex Gleason
dd7977bb68 Merge branch 'birth-dates' into 'develop' 
Birth dates

See merge request pleroma/pleroma!3608
 2022-01-25 15:35:47 +00:00
Alex Gleason
6bc109b31d
Merge remote-tracking branch 'pleroma/recipients-inline' into recipients-inline 2022-01-24 20:20:04 -06:00
Alex Gleason
267184b70e
ForceMentionsInContentTest: return mentions in a not terrible format 2022-01-24 20:03:43 -06:00
Alex Gleason
c5a20c80c4
ForceMentionsInContent: simplify finding users 2022-01-24 19:44:44 -06:00
Alex Gleason
d5644a52aa
ForceMentionsInContent: wrap inline mentions with span tag 2022-01-24 19:11:45 -06:00
Alex Gleason
1bbc701a3a
ForceMentionsInContent: use to instead of tag 2022-01-24 19:11:14 -06:00
Alex Gleason
51dd5a6e21
Merge remote-tracking branch 'pleroma/quote-post' into quote-improvements 2022-01-24 17:18:30 -06:00
Alex Gleason
7f1d82a523
Merge remote-tracking branch 'pleroma/develop' into merge-upstream 2022-01-24 16:55:39 -06:00
Alex Gleason
1cb8326cfb
Merge remote-tracking branch 'origin/develop' into quote-post 2022-01-24 16:48:37 -06:00
Alex Gleason
0571f8f553
Add InlineQuotePolicy to force quote URLs inline 2022-01-24 16:44:35 -06:00
Alex Gleason
53de3a9d44 Revert "Merge branch 'log-slow-queries' into 'develop'" 
This reverts merge request !3553
 2022-01-24 18:54:43 +00:00
Alex Gleason
683f96da00
Merge remote-tracking branch 'pleroma/quote-post' into quote-post 2022-01-23 16:10:36 -06:00
Alex Gleason
c04241eb4a
ActivityDraft: mix format, defensive actor ID 2022-01-23 16:03:46 -06:00
Alex Gleason
d39ccd8372
ActivityDraft: mention the OP of a quoted post 2022-01-23 15:46:44 -06:00
Alex Gleason
d903a6b85d
Return quote_url through the API, don't render quotes more than 1 level deep 2022-01-23 13:55:25 -06:00
marcin mikołajczak
1dba3bc4dc Preserve order of mentioned users 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-01-23 12:29:01 +01:00
marcin mikołajczak
0266bc3c96 Birthdays: hide_birthday -> show_birthday 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-01-23 09:13:33 +01:00
Alex Gleason
c22b354587
InstanceView: add "quote_posting" feature 2022-01-22 23:09:33 -06:00
Alex Gleason
c13ccb0f84
mix format 2022-01-22 22:57:42 -06:00
Alex Gleason
69cab8da89
ActivityDraft: allow quoting 2022-01-22 22:15:54 -06:00
Alex Gleason
870023e286
ActivityDraft: create quote posts 2022-01-22 21:27:05 -06:00
Alex Gleason
62c27425d7
Merge remote-tracking branch 'pleroma/mrf-tuples-fix' into merge-upstream 2022-01-22 20:24:14 -06:00
Alex Gleason
06aa38447b
Merge remote-tracking branch 'pleroma/develop' into merge-upstream 2022-01-22 20:24:04 -06:00
Alex Gleason
d4e9cb600d
StatusView: render the whole quoted status 2022-01-22 20:05:58 -06:00
Alex Gleason
0584a6f131
StatusView: show quoted posts through the API, probably 2022-01-22 19:47:08 -06:00
Alex Gleason
04709e1a27
Transmogrifier: fix quoteUrl here too 2022-01-22 19:14:39 -06:00
Alex Gleason
fbdfeb326d
Transmogrifier: fetch quoted post 2022-01-22 18:46:58 -06:00
Alex Gleason
0f34eb60d4
ObjectValidators: improve quoteUrl compatibility 2022-01-22 18:03:22 -06:00
Alex Gleason
c6ff668b1d
ObjectValidators: accept "quoteUrl" field 2022-01-22 16:41:51 -06:00
Alex Gleason
acfded5ae8
MRF reasons: normalize config for backwards compatibility 2022-01-22 15:53:08 -06:00
Alex Gleason
e72fd4ceb6
SimplePolicy reasons: handle legacy config 2022-01-22 14:32:55 -06:00
Alex Gleason
aaa9314f4c
Merge remote-tracking branch 'origin/develop' into birth-dates 2022-01-22 14:24:50 -06:00
Alex Gleason
66e8c6f90f
Birthdays: birth_date --> birthday 2022-01-22 13:21:55 -06:00
Alex Gleason
4ac36ad19d Merge branch 'next' into 'develop' 
Merge Pleroma's develop branch

See merge request soapbox-pub/soapbox!67
 2022-01-22 19:08:14 +00:00
Alex Gleason
64f48c4239
Merge remote-tracking branch 'pleroma/develop' into next 2022-01-22 11:24:43 -06:00
Finn Behrens
8328289619 Add autocompelete values suggested by Apple 
Link: https://developer.apple.com/documentation/security/password_autofill/enabling_password_autofill_on_an_html_input_element
 2022-01-22 10:00:43 +01:00
Alex Gleason
6ffe43af70 Merge branch 'private-pins' into 'develop' 
Support private pinned posts from Mastodon

See merge request pleroma/pleroma!3611
 2022-01-20 23:18:24 +00:00
marcin mikołajczak
88c21b9282 Support private pinned posts from Mastodon 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-01-20 12:35:32 +01:00
marcin mikołajczak
74cf0f0355 Update changelog 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-01-19 23:52:46 +01:00
NEETzsche
508c718f7c Block notification policy 2022-01-19 21:02:03 +00:00
rinpatch
a02cfd7f52 Add ForceMentionsInContentPolicy 
Even though latest PleromaFE supports displaying these properly, mobile
apps still exist, so I think we should offer a workaround to those who
want it.
 2022-01-19 21:04:57 +03:00
marcin mikołajczak
c180f9276f check if remote bday is valid 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-01-19 17:19:28 +01:00
marcin mikołajczak
dfb2808535 Birth dates: Add tests 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-01-18 23:15:31 +01:00
marcin mikołajczak
397f67fef8 Format code, expose instance configuration related to birth dates 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-01-18 18:18:38 +01:00
marcin mikołajczak
b108b05650 Birth dates, birthday reminders API, allow instance admins to require minimum age 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-01-18 14:57:48 +01:00
NEETzsche
6284353025 Add blockers_visible to features list when it's enabled 2022-01-14 23:08:33 +00:00
NEETzsche
bd5dbbac1f Put blockers_visible in the features list when it's enabled 2022-01-14 21:25:56 +00:00
NEETzsche
ed6973d3d9 Show blockers_visible in /api/v1/instance 2022-01-14 20:52:31 +00:00
marcin mikołajczak
eedf551eed Add more tests 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-01-12 22:41:34 +01:00
marcin mikołajczak
0f90fd5805 WIP account endorsements 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-01-12 18:15:10 +01:00
lain
bf0b32c9aa Merge branch 'pleroma-result-1_13' into 'develop' 
move result into with guard

See merge request pleroma/pleroma!3557
 2022-01-11 13:39:23 +03:00
marcin mikołajczak
4f249b2397 Merge remote-tracking branch 'origin/develop' into account-endorsements 2022-01-10 20:04:14 +01:00
Sean King
ffeae7ef2c
Fix merge conflict in CHANGELOG.md 2021-12-29 18:08:50 -07:00
marcin mikołajczak
1657db656c AccountController.lookup: skip auth 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2021-12-28 20:02:59 +01:00
marcin mikołajczak
0dd1caa841 AccountController.lookup: skip visibility check 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2021-12-28 18:24:48 +01:00
marcin mikołajczak
9032d065e6 wip 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2021-12-28 18:07:19 +01:00
marcin mikołajczak
746c9daa62 Merge remote-tracking branch 'pleroma/develop' into mastodon-lookup 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2021-12-28 16:27:27 +01:00
marcin mikołajczak
f734579965 MastoAPI: Add GET /api/v1/accounts/lookup 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2021-12-28 16:11:17 +01:00
Alex Gleason
de7f84deb3 Merge branch 'apps-api-endpoint' into 'develop' 
Apps API endpoint

See merge request pleroma/pleroma!3583
 2021-12-28 14:38:02 +00:00
Tusooa Zhu
9a27cb4f9d
Deal with target not found error in add_alias 
Ref: emit-move
 2021-12-28 01:11:08 -05:00
Tusooa Zhu
eb383ef8d3
Make move_account endpoint process non-existent users properly 
Ref: emit-move
 2021-12-28 01:11:08 -05:00
Tusooa Zhu
a677c621e8
Make move_following worker follow then unfollow 
Ref: emit-move
 2021-12-28 01:11:08 -05:00
Tusooa Zhu
4f44fd32ea
Federate unfollow activity in move_following properly 
0: Use the CommonAPI unfollow function to make sure the
unfollow activity is federated.

1: Limit the follow and unfollow to local followers only,
while let the romote servers decide whether to move their followers.

Ref: emit-move
 2021-12-28 01:11:08 -05:00
Tusooa Zhu
e41eee5ed1
Make Move activity federate properly 
Ref: emit-move
 2021-12-28 01:11:08 -05:00
Tusooa Zhu
54d7b4354c
Add deleting alias endpoint 
Ref: emit-move
 2021-12-28 01:11:08 -05:00
Tusooa Zhu
c1aa3c98ac
Add get and add aliases endpoints 
Ref: emit-move
 2021-12-28 01:11:08 -05:00
Tusooa Zhu
60081a8818
Add User.add_alias/2 and User.alias_users/1 
Ref: emit-move
 2021-12-28 01:11:07 -05:00
Tusooa Zhu
0af77b20c1
Implement moving account 
Ref: emit-move
 2021-12-28 01:10:34 -05:00