Compare commits

...

166 commits

Author SHA1 Message Date
Henry Jameson
2561febffd thanks emacs/arch 2024-03-26 12:48:52 +02:00
Henry Jameson
d65bdde809 Merge remote-tracking branch 'origin/develop' into shigusegubu 2024-03-26 12:34:10 +02:00
lain
987f44d811 Merge branch 'bookmark-folders' into 'develop'
Fix BookmarkFolderView, add test

See merge request pleroma/pleroma!4096
2024-03-20 13:26:47 +00:00
marcin mikołajczak
37ec645ff2 Fix BookmarkFolderView, add test
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-03-20 13:24:43 +01:00
lain
f775a1931b Merge branch 'transient-validators-defaults' into 'develop'
Set defaults values on transient objects (attachment, poll options) validators

See merge request pleroma/pleroma!4090
2024-03-19 12:44:13 +00:00
Lain Soykaf
4e8a1b40cb Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into transient-validators-defaults 2024-03-19 16:26:02 +04:00
lain
8a14fdbe47 Update transient-validators-defaults.change 2024-03-19 12:03:43 +00:00
lain
4e37cd85ef Merge branch 'fix-bookmark-test' into 'develop'
CI: Move changelog check to later in the pipeline

See merge request pleroma/pleroma!4095
2024-03-19 12:02:10 +00:00
Lain Soykaf
040a980277 Add changelog 2024-03-19 15:03:16 +04:00
Lain Soykaf
afae3a94a4 CI: Move changelog check to later in the pipeline
No reason to not run tests.
2024-03-19 13:54:35 +04:00
Haelwenn (lanodan) Monnier
4ad1d02d7e
changelog.d/transient-validators-defaults.change: insert 2024-03-15 16:25:02 +01:00
Haelwenn (lanodan) Monnier
48c22a67de
QuestionOptionsValidator: set default AS types 2024-03-15 16:22:18 +01:00
Haelwenn (lanodan) Monnier
8b651fab1d
AttachmentValidator: Set "Link" as default type 2024-03-15 16:22:18 +01:00
Henry Jameson
5a80729986 always include title, manifest and favicon 2023-11-01 18:57:20 +02:00
Henry Jameson
034189afc8 Merge branch 'favicon' into shigusegubu 2023-11-01 18:51:03 +02:00
Henry Jameson
7861ac27f2 Merge remote-tracking branch 'origin/develop' into shigusegubu 2023-11-01 18:50:58 +02:00
Henry Jameson
6f38915198 lint? 2023-10-30 11:29:57 +02:00
Henry Jameson
d8eb741b6d changelog 2023-10-29 19:32:07 +02:00
Henry Jameson
af4be5623e Merge branch 'favicon' into shigusegubu 2023-10-29 19:29:07 +02:00
Henry Jameson
3d2067d433 typo 2023-10-29 19:28:57 +02:00
Henry Jameson
7a84ae4548 Merge branch 'favicon' into shigusegubu 2023-10-29 19:25:45 +02:00
Henry Jameson
5848ef137f add fields needed for chrome to make website installable 2023-10-29 19:25:14 +02:00
Henry Jameson
b1b41e8be1 Merge branch 'favicon' into shigusegubu 2023-10-29 19:14:48 +02:00
Henry Jameson
82e4c5d077 include the PWA manifest 2023-10-29 19:13:02 +02:00
Henry Jameson
337d047c4d embed favicon on backend and make it configurable 2023-10-29 18:58:57 +02:00
Henry Jameson
a5048c270e oops 2023-09-04 19:39:51 +03:00
Henry Jameson
303db126a8 Merge remote-tracking branch 'origin/tusooa/quote' into shigusegubu 2023-09-04 19:34:06 +03:00
Henry Jameson
dd35bf93c7 Merge remote-tracking branch 'origin/develop' into shigusegubu 2023-09-04 19:30:54 +03:00
tusooa
c525496e75 Merge branch 'develop' into 'tusooa/quote'
# Conflicts:
#   lib/pleroma/constants.ex
2023-08-31 00:35:37 +00:00
Henry Jameson
78697ad23a Merge remote-tracking branch 'origin/develop' into shigusegubu 2023-07-19 21:06:02 +03:00
tusooa
bffa258a23
Fix quote_visible attribute 2023-07-13 06:56:06 -04:00
tusooa
2436c9d61d
Expose quote_id parameter on the api 2023-07-13 06:56:06 -04:00
tusooa
5ebabcd582
Do not mention original poster when quoting 2023-07-13 06:56:00 -04:00
tusooa
44eb648179
Fix config descriptions for mrf inline quote 2023-07-12 22:07:51 -04:00
tusooa
fca6a7933e
Fix TransmogrifierTest 2023-07-12 14:58:20 -04:00
tusooa
01eafc0372
Make InlineQuotePolicy history aware 2023-07-12 14:37:12 -04:00
tusooa
05beada21b
Add mrf to force link tag of quoting posts 2023-07-12 14:30:58 -04:00
tusooa
f8b01788eb
Keep incoming Link tag 2023-07-12 14:08:24 -04:00
tusooa
8f252fd99b
Parse object link as quoteUrl 2023-07-12 11:09:10 -04:00
tusooa
2c70857f9f
Allow more flexibility in InlineQuotePolicy 2023-07-12 09:30:43 -04:00
tusooa
26b499eca0
Fix CommonAPITest 2023-07-10 19:43:18 -04:00
tusooa
ebcac09f5c
Add changelog 2023-07-10 18:28:13 -04:00
tusooa
3bb384d378
Allow local quote and private self-quote 2023-07-10 18:27:23 -04:00
tusooa
44cea92fbc
Unify logic for normalizing quoteUri 2023-07-10 18:14:14 -04:00
Alex Gleason
52c81cdf68
InlineQuotePolicy: skip objects which already have an .inline-quote span 2023-07-10 17:52:10 -04:00
Alex Gleason
34cf4222c1
Actually, don't send _misskey_quote anymore 2023-07-10 17:52:10 -04:00
Alex Gleason
5df951f670
InlineQuotePolicy: improve the way Markdown quotes are displayed by other software 2023-07-10 17:52:10 -04:00
Alex Gleason
32e284ed2c
Handle Fedibird's new quoteUri field 2023-07-10 17:52:10 -04:00
Alex Gleason
f89874596e
Transmogrifier: federate quotes with _misskey_quote field 2023-07-10 17:52:10 -04:00
Alex Gleason
f8b420932e
StatusView: return quote post inside a reblog 2023-07-10 17:52:10 -04:00
Alex Gleason
1cb39bfb90
Add InlineQuotePolicy as a default MRF 2023-07-10 17:52:10 -04:00
Alex Gleason
63f8c33353
InlineQuotePolicy: don't add line breaks to markdown posts 2023-07-10 17:52:10 -04:00
Alex Gleason
029a1045d4
StatusView: add quote_visible param 2023-07-10 17:52:09 -04:00
Alex Gleason
14a26e4433
StatusView: fix quote visibility 2023-07-10 17:52:09 -04:00
Alex Gleason
6d26ce54c4
CommonAPI: disallow quoting private posts through the API 2023-07-10 17:52:09 -04:00
Alex Gleason
1a6ab18ebc
Add InlineQuotePolicy to force quote URLs inline 2023-07-10 17:52:07 -04:00
Alex Gleason
06cc4ad7fd
Scrubber.Default: allow span.quote-inline for quote post compatibility 2023-07-10 17:51:03 -04:00
Alex Gleason
a3b7c1da4f
ActivityDraft: mix format, defensive actor ID 2023-07-10 17:49:42 -04:00
Alex Gleason
cca63d707d
ActivityDraft: mention the OP of a quoted post 2023-07-10 17:49:42 -04:00
Alex Gleason
4bcdf0cf4f
Return quote_url through the API, don't render quotes more than 1 level deep 2023-07-10 17:49:42 -04:00
Alex Gleason
2f9a098dd5
@context: add quoteUrl 2023-07-10 17:49:42 -04:00
Alex Gleason
e47c6a2445
InstanceView: add "quote_posting" feature 2023-07-10 17:49:42 -04:00
Alex Gleason
72a0236c9a
Fix typos 2023-07-10 17:49:42 -04:00
Alex Gleason
57e4e43042
mix format 2023-07-10 17:49:42 -04:00
Alex Gleason
efd6d40a40
TransmogrifierTest: prepare an outgoing quote post 2023-07-10 17:49:42 -04:00
Alex Gleason
b9c10c61b7
StatusControllerTest: test creating a quote post 2023-07-10 17:49:41 -04:00
Alex Gleason
bc2ffd0c16
BuilderTest: build quote post 2023-07-10 17:49:41 -04:00
Alex Gleason
a938a96ae8
ActivityDraft: allow quoting 2023-07-10 17:49:41 -04:00
Alex Gleason
fe5b8cbe05
ActivityDraft: create quote posts 2023-07-10 17:49:41 -04:00
Alex Gleason
f95cad4603
StatusView: render the whole quoted status 2023-07-10 17:49:41 -04:00
Alex Gleason
d10408558e
StatusView: show quoted posts through the API, probably 2023-07-10 17:49:41 -04:00
Alex Gleason
5fdf4d1b1c
Transmogrifier: fix quoteUrl here too 2023-07-10 17:49:41 -04:00
Alex Gleason
f01e2d0902
Transmogrifier: fetch quoted post 2023-07-10 17:49:39 -04:00
Alex Gleason
2c17d29c4b
ObjectValidators: improve quoteUrl compatibility 2023-07-10 17:49:06 -04:00
Alex Gleason
4c90f39e14
Quote post: add fixtures 2023-07-10 17:49:06 -04:00
Alex Gleason
f39a86344c
ObjectValidators: accept "quoteUrl" field 2023-07-10 17:48:54 -04:00
Henry Jameson
00a9eae74a Merge remote-tracking branch 'origin/develop' into shigusegubu 2023-05-27 16:42:36 +03:00
Henry Jameson
ab0ddda321 Merge remote-tracking branch 'origin/develop' into shigusegubu
* origin/develop:
  fix: append field values to bio before parsing
  Indicate in changelog that removal of crypt is breaking
  Allow custom emoji reactions: Add pleroma_custom_emoji_reactions feature, review changes
  docs: Be more explicit about the level of compatibility of OTP releases
  Remove crypt(3) support
  Allow custom emoji reactions: add test for mixed emoji react, fix credo errors
  Allow custom emoji reactions: Fix tests, mixed custom and unicode reactions
  Allow reacting with remote emoji when they exist on the post (#200)
  feat: build rel me tags with profile fields
2023-03-20 21:30:28 +02:00
Henry Jameson
ece1f7bca6 Revert "testing newer pot"
This reverts commit f72beb6c26.
2023-03-20 21:29:24 +02:00
Henry Jameson
f72beb6c26 testing newer pot 2023-03-10 00:08:08 +02:00
Henry Jameson
5f29bf2e4f Merge remote-tracking branch 'origin/develop' into shigusegubu
* origin/develop: (57 commits)
  remove static_fe pipeline for /users/:nickname/feed
  oops, remove unused import
  use scrub_html_and_truncate instead of scrub_html for feed item title
  modify Utils.scrub_html_and_truncate to take omission parameter
  format feed_view.ex
  feed eex templates: use published field from @data, not @activity.data
  fix tag feeds: remote activities might not have a summary field
  Make clear the test names
  Fix FederatorTest
  Stop oban from retrying if validating errors occur when processing incoming data
  Add the security fix to the changelog
  Sanitize filenames when uploading
  Allow with_relationships param for blocks
  Bundle frontend
  Bump version in mix project to 2.5.1
  Compose changelog for 2.5.1
  Ignores in exiftool read descriptions
  Bump crypt to v1.0.1
  Update mix.exs
  Bump linkify
  ...
2023-03-09 23:19:11 +02:00
Henry Jameson
e2eeded539 Merge remote-tracking branch 'origin/develop' into shigusegubu
* origin/develop: (126 commits)
  Revert "Merge branch 'copyright-bump' into 'develop'"
  Bump copyright year
  Extract translatable strings
  mix: version 2.5.50
  mix: Release 2.5.0
  CHANGELOG: Set 2.5.0
  Git merge is not my favorite tool
  Revert "Delete report notifs when demoting from superuser"
  Update PleromaFE bundle to 2.5.0
  Make lint happy
  Use crazy hack to finally get pleroma:report notifications not visible after revoking privileges
  Update AdminFE bundle to version 2.5.0
  Extract translatable strings
  Fix TwitterCard meta tags
  Fix CommonAPI delete function to use User.privileged? instead of User.superuser?
  use to_rfc2822 instead of pub_date in tests, too
  document rss/atom fix in changelog
  modify user feed controller test to expect summary for title
  remove pub_date() -- use to_rfc2822 instead
  remove ap_id test -- the element makes the feed break
  ...
2023-01-03 20:58:13 +02:00
Henry Jameson
447bfcdb35 Merge remote-tracking branch 'origin/develop' into shigusegubu
* origin/develop: (208 commits)
  Document inclusion of wasm-unsafe-eval
  Update http_security_plug.ex
  Update lib/pleroma/web/plugs/http_security_plug.ex
  try to fix ruffle on chrome
  Alter priority of Delete activities to be lowest
  Deletes do not generate notifications of any kind, so skip trying
  Object.Fetcher: Set reachable on successful fetch
  Translated using Weblate (Ukrainian)
  Added translation using Weblate (Ukrainian)
  Added translation using Weblate (Ukrainian)
  Lint
  Update config cheatsheet
  Clarify config description
  Document Oban workers getting timeouts defined
  Lint
  Define sane Oban Worker timeouts
  Clean up stale entries in mix.lock
  Document removal of Quack
  Add migration to remove Quack from ConfigDB
  Remove Quack logging backend
  ...
2022-11-18 01:38:17 +02:00
Henry Jameson
550693111e Merge remote-tracking branch 'origin/develop' into shigusegubu
* origin/develop: (115 commits)
  Change test case wording
  Use `duration` param for mute expiration duration
  Emoji: apply recommended tail call changes
  Extract translatable strings
  Emoji: split qualification variation into a module
  Add authorized_fetch_mode to description.exs
  EmojiReactValidator: use new qualification method
  Emoji: implement full-qualifier using combinations
  EmojiReactValidator: fix emoji qualification
  Revert "Merge branch 'fix/emoji-react-qualification' into 'develop'"
  Translated using Weblate (French)
  Translated using Weblate (Chinese (Simplified))
  Translated using Weblate (Chinese (Simplified))
  Translated using Weblate (Chinese (Simplified))
  Translated using Weblate (Chinese (Simplified))
  Translated using Weblate (Chinese (Simplified))
  Translated using Weblate (Chinese (Simplified))
  Translated using Weblate (Chinese (Simplified))
  Translated using Weblate (Chinese (Simplified))
  Translated using Weblate (Chinese (Simplified))
  ...
2022-08-01 14:55:02 +03:00
Henry Jameson
83e4a112b9 Merge remote-tracking branch 'origin/develop' into shigusegubu
* origin/develop:
  Add tlsv1.3 to suggestions
  hackney adapter helper & reverse proxy client: enable TLSv1.3
  StealEmojiPolicy: fix String rejected_shortcodes
  Instruct users to run 'git pull' as the pleroma user
  Also use actor_type to determine if an account is a bot in antiFollowbotPolicy
  mix: Bump to 2.4.52 for 2.4.3 mergeback
  Skip cache when /objects or /activities is authenticated
  Allow to skip cache in Cache plug
  update sweet_xml [Security]
2022-06-07 16:02:14 +03:00
Henry Jameson
46c4d3b80f huuups 2022-04-19 18:17:41 +03:00
Henry Jameson
d08362cb30 hups 2022-04-19 18:17:25 +03:00
Henry Jameson
aa38f1da41 resolve deprecation warnings in conf 2022-04-19 18:16:30 +03:00
Henry Jameson
0613478bdb engage db congfiguration 2022-04-19 17:56:26 +03:00
Henry Jameson
31115e24c0 Merge remote-tracking branch 'origin/develop' into shigusegubu
* origin/develop: (294 commits)
  Fix incorrect fallback when English is set to first language
  Fix eratic test for POST /api/pleroma/admin/reports/:id/notes
  After code review
  Support fallbacking to other languages
  Delete report notifs when demoting from superuser
  Update Caddyfile to Caddy v2
  Lint
  Support multiple locales from userLanguage cookie
  Support multiple locales formally
  Make lint happy
  Add test for fallbacking to a general language
  Fallback to a variant if the language in general is not supported
  Add changelog
  Document API addition
  Allow user to register with custom language
  Allow update_credentials to update User.language
  Send emails i18n'd using backend-stored user language
  Make all emails translatable
  Fix digest test
  Make mail and mailer translatable
  ...
2022-04-19 14:27:21 +03:00
Henry Jameson
d860aa32f7 revert to default CSP for testing 2022-04-06 11:16:53 +03:00
Henry Jameson
9916734b76 Merge remote-tracking branch 'origin/develop' into shigusegubu
* origin/develop: (33 commits)
  maybe_notify_subscribers: Don't create notifications from ingested messages
  TwitterAPI: Make change_email require body params instead of query
  TwitterAPI: Make change_password require body params instead of query
  Make the OPT recomendation clearer
  ObjectAgePolicy: Fix pattern matching on published
  fix: stream out Create Activity
  Improve readability
  Quarantine placeholders
  improve changelog entry
  Make transparency_exclusions use tuples in admin-fe
  Add key- and valuePlaceholders for quarantined_instances and mrf_simple
  Add transparency_exclusions also to the breaking changes
  Change docs
  quarantine instances info
  Change what nodeinfo returns without breaking backwards compatibility
  Return maps in node_info
  Add database migrations
  Fixed deprecation warning checks
  config/description.exs: Update quarantine settings to tuples
  make linter happy
  ...
2021-08-11 21:56:37 +03:00
Henry Jameson
78c21efa1e Merge remote-tracking branch 'origin/develop' into shigusegubu
* origin/develop: (252 commits)
  mix.exs: 2.4.50
  Update PleromaFE Bundle (2.4.0)
  CHANGELOG.md: Fix instances of 2020 being actually 2021
  Release 2.4.0
  Update AdminFE bundle
  Visibility: check Tombstone objects in visible_for_user?/2
  CHANGELOG: fixed JSON error rendering
  Add activity+json to Phoenix :format_encoders Fixes ErrorView rendering
  CHANGELOG: AdminAPI return date with users
  AdminAPI: add date to users
  CHANGELOG: AdminAPI users sort
  AdminAPI: sort user results by ID descending
  Moderators: reorganize :admin_api pipeline in Router
  Moderators: add UserIsStaffPlug
  AP C2S: Remove restrictions and make it go through pipeline
  Update Linkify to fix crash on posts with a URL we failed to parse correctly
  fix the fucking list timelines on mastofe/soapbox-fe
  Deletions: change User.purge/1 to defp, add CHANGELOG entry
  Deletions: don't purge keys so Delete/Undo activities can be signed
  Deletions: allow deactivated users to be deleted
  ...
2021-08-08 17:59:23 +03:00
Henry Jameson
a756ec71a7 try to fix ruffle on chrome 2021-04-12 00:45:03 +03:00
Henry Jameson
a5fab1c8af Merge remote-tracking branch 'origin/develop' into shigusegubu
* origin/develop: (159 commits)
  Fix CHANGELOG entry meant for next release
  Revert "Merge branch 'patch-fix-open-api-spec' into 'develop'"
  object_validator: Refactor most of validate/2 to a generic block
  date-times are always strings
  Fix function calls due to module name change
  Temp file leaked, oops
  Add more details to the cheatsheat for FollowBot MRF
  Prefer FollowBot naming convention vs Followbot
  Document new FollowBot MRF
  More tests to validate Followbot is behaving
  Remove Task.async as it is broken here and probably a premature optimization anyway
  Only need to validate a follow request is generated for now
  Revert
  Do not try to follow local users. Their posts are already available locally on the instance.
  Change module name to FollowbotPolicy
  Add follow_requests_outstanding_since?/3 to Pleroma.Activity
  Lint
  Better checking of previous follow request attempts
  Prevent duplicates from being processed
  Make the followbot only dispatch follow requests once per 30 day period
  ...
2021-04-05 02:46:35 +03:00
Henry Jameson
e7aebdf7b6 Merge remote-tracking branch 'origin/develop' into shigusegubu
* origin/develop: (185 commits)
  OAuthScopesPlug: remove transform_scopes in favor of explicit admin scope definitions
  OpenAPI: Add `admin:` scope prefix to admin operations
  Remove `:auth, :enforce_oauth_admin_scope_usage`
  Do not want these interfering with develop builds
  Make it possible to generate custom docker images by prefixing the branch name with "build-docker"
  Chats: Introduce /api/v2/pleroma/chats which implements pagination
  ChatMessage schema: Add `unread` property
  Relicense documentation under CC-BY-4.0
  Add API endpoint to remove a conversation
  update changelog to mention change of avatar
  replace avi.png
  Add myself to .mailmap
  [#2053] Changed `Notification/for_user_query/2` to use join to filter out inactive actors instead of subselect of _all_ inactive AP ids from `users`.
  [#2510] Improved support for app-bound OAuth tokens. Auth-related refactoring.
  not used mock
  OpenAPI spec: Do not show build enviroment in the spec version
  OpenAPI spec task: Load pleroma application to get version info
  Lint
  Revert "Add plaintext support for all emails except the digest"
  MRF NoEmptyPolicy: Deny posts from local users if there is no content or only mentions.
  ...
2021-02-20 20:47:18 +02:00
Henry Jameson
697397e2b8 Merge remote-tracking branch 'origin/develop' into shigusegubu
* origin/develop: (145 commits)
  CHANGELOG.md: Remove wrong entries from Unreleased(patch)
  Only run one attachment cleanup job per node
  Just validate command is in PATH; forking a shell is wasteful
  Linting.
  Pbkdf2: Use it everywhere.
  Password -> Password.Pbkdf2
  Linting
  Password: Replace Pbkdf2 with Password.
  Password: Add password module
  COPYING: Bump copyright to 2021
  Bump Copyright to 2021
  Pagination: Don't be dos'd by random parameters.
  Simplify. We will always have a result from Upload.base_url/0, so just add it to the list
  Fix regression in MediaProxy.local?/0 and appending the Upload.base_url to whitelisted domains
  ChatMessages: Fix pagination headers.
  Formatting
  .formatter.exs: Format optional migrations
  Add development section
  Apply 4 suggestion(s) to 2 file(s)
  Move construction of S3 base URL with optional namespace and bucket to Upload.base_url/0
  ...
2021-01-18 04:04:27 +02:00
Henry Jameson
d5afe8a884 Merge remote-tracking branch 'origin/develop' into shigusegubu
* origin/develop: (330 commits)
  Translated using Weblate (Chinese (Simplified))
  Minor refactoring of the logic for hiding followers/following counts.
  changelog
  Fix for dropping posts/notifs in WS when mix task is executed
  Fixed Rich Media Previews
  Majic: specify commit so source users do not get surprise updates
  Switch to a fork of Hackney 1.15.2 for now so we can have our URL normalization bugfix
  instance.gen: Warn that stripping exif requires exiftool
  instance.gen task: Only show files which will be actually overwritten
  Translated using Weblate (Ukrainian)
  Added translation using Weblate (Ukrainian)
  Tweaks to OAuth entities expiration: changed default to 30 days, removed hardcoded values usage, fixed OAuthView (expires_in).
  Changed default OAuth token expiration time to 30 days.
  [#3112] .gitattributes fix.
  Update CHANGELOG
  ApplicationRequirements: Add test, more text for pool size.
  Apply 1 suggestion(s) to 1 file(s)
  Add a startup error for modified Repo pool_size
  instance.reachable?: Limit to binary input
  instance: Do not fetch unreachable instances
  ...
2020-12-17 11:27:54 +02:00
Henry Jameson
1f3c8cf707 Merge remote-tracking branch 'origin/develop' into shigusegubu
* origin/develop: (162 commits)
  Improve Keyword descriptions for AdminFE
  Fixed User.is_discoverable attribute rendering in Admin API User view.
  @doc fix.
  FrontStatic plug: excluded invalid url
  phoenix_controller_render_duration is no longer available in telemetry of Phoenix 1.5+
  ActivityPub: Add back debug call + explanation.
  clients.md: Add AndStatus, note supported protocols
  Fix link reference
  NoNewPrivileges breaks ability to send email via sendmail because it restricts ability to run setuid/setgid binaries
  Changelog: Add info about whitespace name remote users.
  User: Correctly handle whitespace names.
  Translated using Weblate (Chinese (Simplified))
  [#3059] Used forked prometheus-phx to remove log spam.
  [#3059] Formatting fix.
  [#3059] Fixed Phoenix 1.5 telemetry processing.
  Changelog: Add information about self-chats
  SideEffects: Correctly handle chat messages sent to yourself
  fix module name
  update changelog
  update docs
  ...
2020-10-30 02:04:07 +02:00
Henry Jameson
5f23876552 Merge remote-tracking branch 'origin/develop' into shigusegubu
* origin/develop: (180 commits)
  Deep link to the user account in AdminFE in account confirmation emails
  Spelling
  Ask user to use matching values for database setup
  Syntax error
  Don't always need to drop
  Improve backup/restore documentation
  Lint
  Apply 1 suggestion(s) to 1 file(s)
  Apply 1 suggestion(s) to 1 file(s)
  Apply 2 suggestion(s) to 2 file(s)
  Improve description yet again
  Don't leak internal variables in the docs. They're useless to users.
  Credo
  Improve descriptions for reserved and proxies
  Add test for an entry without CIDR format
  Move hardcoded default configuration into config.exs
  Fix docs for default headers used by RemoteIp. We only use X-Forwarded-For by default.
  Document the NSFW link preview change
  Add helper function to convert single IPs into CIDR format if they were not provided that way
  Docs: Modify docs so the postgres config is harder to get wrong.
  ...
2020-10-11 21:13:29 +03:00
Henry Jameson
461c465fe7 fix filenameposting 2020-09-18 13:39:01 +03:00
Henry Jameson
4174bc6126 Merge remote-tracking branch 'origin/develop' into shigusegubu
* origin/develop: (566 commits)
  Fix MRF reject for ChatMessage
  Create MRF.filter_pipeline to inject :object_data when present
  KeywordPolicy: Still match when fields are absent
  pleroma-fe bundle: bump to b225c3578f3c89af5ed3a0be3f8f3a6bbcedcc7d
  CHANGELOG.md: Add 2.1.2 entry
  mix.exs: bump version to 2.1.2
  Merge branch '2130-mfa-users-oauth-login-fix' into 'develop'
  Merge branch 'fix/streaming-termination-errors' into 'develop'
  Merge branch 'fix/mrf-simple-welcome-chats' into 'develop'
  Merge branch 'reply-visibility-user-guard' into 'develop'
  Merge branch 'bugfix/mrf-ingestion' into 'develop'
  adapt to new user factory behavior
  add test and changelog entry
  User search respect discoverable flag
  Merge branch 'hotfix/rich-media-compile-error' into 'develop'
  Merge branch 'feat/rich-media-head' into 'develop'
  Deny ConfigDB migration when deprecated settings found
  RichMedia: Fix log spam on failures and resetting TTL on cached errors
  Return the file content for `GET /api/pleroma/admin/instance_document/:document_name`
  add description to changelog
  ...
2020-09-17 23:40:53 +03:00
Henry Jameson
605d542a7c Merge remote-tracking branch 'origin/develop' into shigusegubu
* origin/develop: (67 commits)
  Fix example json response
  ChatMessage schema: Add preview cards.
  ChatMessageReferenceView: Display preview cards.
  OTP users need Pleroma running to execute pleroma_ctl, so reorganize instructions.
  Attempt to fix markdown formatting
  Apply 1 suggestion(s) to 1 file(s)
  set versions
  updated `cors_plug`
  set `postgrex` version
  set `web_push_encryption` version
  updated `calendar` package
  Expose seconds_valid in Pleroma Captcha API endpoint
  :show_reactions, refactor the other test
  :show_reactions, add CHANGELOG.md, refactor test
  feed/user_controller: Return 404 when the user is remote
  AccountController: Don't explicitly ask to keep users unconfirmed.
  EnsureRePrepended: Don't break on chat messages.
  update mogrify package
  set http_signatures version
  set `jason` version
  ...
2020-07-31 11:31:21 +03:00
Henry Jameson
6d93391dee power time 2020-07-31 11:29:52 +03:00
Henry Jameson
34272773b0 important shit 2020-07-28 21:51:59 +03:00
Henry Jameson
080416f175 demilitarize 2020-07-27 22:09:52 +03:00
Henry Jameson
e131678d69 Merge remote-tracking branch 'origin/develop' into shigusegubu
* origin/develop: (213 commits)
  Apply 1 suggestion(s) to 1 file(s)
  ReverseProxy tesla client: remove handling of old_conn
  ReverseProxy: Fix a gun connection leak when there is an error with no body
  OpenAPI: remove accidentally pasted buffer data
  OpenAPI: Replace actor_id by account_id to follow ChatMessage schema
  Update types in Pleroma.Formatter group
  added migrate old settings to new
  Ensure Oban is available during mix tasks. Fixes: mix pleroma.user rm username
  Fix mix tasks that make HTTP calls by starting the Gun connection pool
  remove duplicate module
  Support blocking via query parameters as well and document the change.
  [#2791] AccountView: renamed `:force` option to `:skip_visibility_check`.
  added warning to use old keys
  Update linkify migration tests to use config from ConfigDB
  Migration to fix malformed Pleroma.Formatter config
  Refactor require_migration/1 into a test helper function
  Add AutolinkerToLinkify migration test
  Fix linkify ConfigDB migration
  [#1973] Fixed accounts rendering in GET /api/v1/pleroma/chats with truish :restrict_unauthenticated. Made `Pleroma.Web.MastodonAPI.AccountView.render("show.json", _)` demand :for or :force option in order to prevent incorrect rendering of empty map instead of expected user representation with truish :restrict_unauthenticated setting.
  Add related_policy field
  ...
2020-07-27 22:08:27 +03:00
Henry Jameson
0e72fdac6e Merge remote-tracking branch 'origin/develop' into shigusegubu
* origin/develop: (164 commits)
  [#1895] credo fix.
  [#1895] Applied code review suggestion.
  [#1895] Documentation hints on private instances and instance/restrict_unauthenticated setting.
  [#1895] Made hashtag timeline respect `:restrict_unauthenticated` instance setting.
  Add "Bot" to User Agent to coerce Twitter into serving OGP <meta> tags.
  Update frontend
  Changelog: Add info about avatar removal
  AccountController: Remove unused `update_?` routes.
  Docs: Document resetting of images
  AccountController: Allow removal / reset of user images.
  Fix getting videos from peertube
  added hyper:// to default protocols
  Config: Remove Statusnet preloader.
  Preloaders: Remove status_net preloader
  Update frontend
  Update frontend
  StaticFE Plug: Use phoenix helper to get the requested format.
  Changelog: Document description limits.
  Docs: document instance differences
  InstanceView: Add chat limit, description limit
  ...
2020-07-08 20:11:33 +03:00
Henry Jameson
593edd3c41 Merge remote-tracking branch 'origin/develop' into shigusegubu
* origin/develop: (53 commits)
  Add warning against parsing/reusing MastoFE settings blob
  Update NotificationOperation spec
  Add `is_muted` to notifications
  Translated using Weblate (Italian)
  Added translation using Weblate (Italian)
  Add include for the "Further reading" section
  HellthreadPolicy: Restrict to Notes and Articles.
  Apply suggestion to lib/pleroma/web/api_spec/operations/pleroma_emoji_pack_operation.ex
  proper error codes for error in adminFE
  Apply suggestion to lib/pleroma/web/api_spec/operations/pleroma_emoji_pack_operation.ex
  cheatsheet.md: no_attachment_links → attachment_links
  fix for packs pagination
  Stop filling conversation field on incoming objects (legacy, unused)
  Only accounts with Service actor_type are considered as bots
  Add support for bot field in update_credentials
  README: Add some troubleshooting info for compilation issues.
  [#1873] Fixes missing :offset pagination param support. Added pagination support for hashtags search.
  default page size for files
  changelog entry
  adding overall count for packs and files
  ...
2020-06-23 01:35:40 +03:00
Henry Jameson
ce6f690a85 Merge remote-tracking branch 'origin/develop' into shigusegubu
* origin/develop: (276 commits)
  Remove `poll` from `notification_type` OpenAPI spec
  credo fix
  CHANGELOG.md: mention minimal elixir version update
  Update OTP releases to official images of 1.10.3
  Chunk the notification type backfill migration
  moving custom ecto types in context folders
  Upgrade to Elixir 1.9
  naming
  fix attemps to merge map
  fix for updated hackney
  Mogrify args as custom tuples
  Fix tests
  Changelog: Add info about conversation view changes.
  Conversations: Return last dm for conversation, not last message.
  Mastodon API: ensure the notification endpoint doesn't return less than the requested amount of records unless it's the last page
  ControllerHelper: Always return id field.
  Apply suggestion to lib/pleroma/web/controller_helper.ex
  Remove use of atoms in MRF.UserAllowListPolicy
  Fix atom leak in Rich Media Parser
  Return an empty map from Pleroma.Web.RichMedia.Parsers.OGP.parse/2
  ...
2020-06-19 15:17:00 +03:00
Henry Jameson
aba9162994 Merge remote-tracking branch 'origin/develop' into shigusegubu
* origin/develop:
  Update AdminFE build, re-enables emoji packs
  Migrations: Make user_id index on notifications better for query.
  Notification: Actually preload objects.
  ActivityPub: Change ordering to `nulls last` in favorites query
  Activity.Queries: Use correct actor restriction.
  Migrations: Add index on client_id and client_secret for apps.
  Config: Restore old new background image
  Fix Oban warnings
  Mastodon API Controllers: Use the correct params for rate limiting.
  [#1501] Made user feed contain public and unlisted activities.
  Skip failing `:crypt` test on mac
  Docs: sql -> SQL
  Apply suggestion to docs/installation/otp_en.md
  Docs: Document reasonable Postgres settings.
  Transmogrifier: Use a simpler way to get mentions.
  User: Change signature of get_users_from_set
  StealEmojiPolicyTest: Fix flaky test.
  Factory: Set users to be ap_enabled by default.
  UserTest: Add test for user refreshing.
  User: Don't error out if we want to refresh a user but can't
2020-05-28 00:45:54 +03:00
Henry Jameson
b30d2ed0e6 Merge remote-tracking branch 'origin/develop' into shigusegubu
* origin/develop:
  StealEmojiPolicyTest: Clean up.
  StealEmojiPolicyTest: Fix flaky test.
  Add Changelog
  OStatusController: Add Mastodon activity compat route.
  ActivityPubController: Add Mastodon activity compat route.
  OStatusController: Add Mastodon compatibility route for objects.
  ActivityPubController: Add Mastodon compatibility route.
  Add OpenAPI spec for AdminAPI.StatusController
  Move status actions to AdminAPI.StatusController
2020-05-25 17:32:13 +03:00
Henry Jameson
8676f39421 Merge remote-tracking branch 'origin/develop' into shigusegubu
* origin/develop:
  Apply suggestion to lib/pleroma/web/common_api/utils.ex
  Update CHANGELOG and docs
  Add filename_display_max_length config
  priv/static: Add a warning discouraging admins from modifying the static files directly
  Fix notifications mark as read API
  EmojiReactionController: Return more appropriate error.
  Credo fixes for the credo god.
  AnnounceValidator: Check for announcability
  Credo fixes.
  Announcements: Fix all tests.
  SideEffects: Builed out Announce effects.
  Pipeline: Don't federate if federation is disabled.
  Announcements: Handle through common pipeline.
  CommonAPI: Change public->private implicit addressing.
  AnnounceValidator: Validate for existing announce
  ObjectValidators: Add basic Announce validator.
  TransmogrifierTest: Fix tests.
  Transmogrifier Test: Extract Announce handling.
2020-05-23 02:33:15 +03:00
Henry Jameson
f20479ded8 fix 2020-05-22 00:37:24 +03:00
Henry Jameson
2a06b66daf fix 2020-05-22 00:33:59 +03:00
Henry Jameson
f9b13c754c Merge remote-tracking branch 'origin/develop' into shigusegubu
* origin/develop: (269 commits)
  Apply suggestion to docs/administration/CLI_tasks/user.md
  rename mix task: `pleroma.user unsubscribe` -> `pleroma.user deactivate`
  Added the ability to upload background, logo, default user avatar, instance thumbnail, and the NSFW hiding image via AdminFE
  fixed `mix pleroma.instance gen`
  Also add new sidebarRight setting
  Add `background_image` to `InstanceOperation`
  Move notification actions to PleromaAPI.NotificationController
  Move conversation actions to PleromaAPI.ConversationController
  Move reaction actions to EmojiReactionController
  Add OpenAPI spec for PleromaAPI.PleromaAPIController
  Changelog: Add background to instance
  Docs: Add background_image in instance
  InstanceOperation: Add background image to example
  MastoFE: update to bundle-2020-05-20
  Apply suggestion to installation/nginx-cache-purge.sh.example
  update purge script
  Synchronize :fe settings in config.exs
  Fix summary
  User.Query: Remove superfluous `distinct`
  UserTest: Hide warning in tests.
  ...
2020-05-22 00:29:15 +03:00
Henry Jameson
74db8f4769 Merge remote-tracking branch 'origin/develop' into shigusegubu
* origin/develop: (381 commits)
  CHANGELOG.md: Add entry for re-registration ban
  Reword changelog entry for follow relationship bug
  Mastodon API: do not create a following relationship if the corresponding follow request doesn't exist when calling `POST /api/v1/follow_requests/:id/authorize`
  Deactivate local users on deletion instead of deleting the record
  [#1732] Made AP C2S :followers and :following endpoints serve on no auth (as for related :api pipeline endpoints).
  PleromaFE bundle supporting follow request notifications. 5f90b6a384
  static-fe.css: Restore and move to /priv/static/static-fe
  OpenAPI: Add `follow_request` to notification types
  Fix sporadic test compilation failure caused by unused alias
  OpenAPI: Remove max pagination limit from the spec
  Updated PleromaFE bundle to prevent notifications loading issue due to unsupported parameter (`with_move`).
  MappedSignatureToIdentityPlug: Fix.
  Signature: Handle non-ap ids in key ids.
  Made follow request notifications non-optional (removed config switch).
  Increase tests on AP C2S
  Dismiss the follow request notification on rejection
  fix for auth check
  docs update
  docs fix
  list of options for pack metadata
  ...
2020-05-02 20:03:41 +03:00
Henry Jameson
5ca35e1251 Merge remote-tracking branch 'origin/develop' into shigusegubu
* origin/develop: (249 commits)
  Add a test for accounts/update_credentials
  Fix activity deletion
  Add emoji support in statuses in staticfe
  AccountView: fix for other forms of <br> in bio
  Mastodon API Account view: Remove an outdated hack
  Improved in-test `clear_config/n` applicability (setup / setup_all / in-test usage).
  restrict_unauthenticated setting
  include_types parameter in /api/v1/notifications
  remove federated testing
  Improved in-test config management functions.
  Fix ssl option on Ecto config breaking release
  Admin API: `PATCH /api/pleroma/admin/users/:nickname/credentials`, `GET /api/pleroma/admin/users/:nickname/credentials`.
  Admin API: `PATCH /api/pleroma/admin/users/:nickname/change_password`
  removing with_move parameter
  Improve documentation of mrf_object_age
  gitlab: create templates for bug reports and release MRs
  warnings fix
  removing from descriptions.exs deprecated settings
  fix for content-type header for tag feed
  adding rss for user feed
  ...
2020-03-25 17:37:53 +02:00
Henry Jameson
dfad261302 fix bullshit new default 2020-02-29 15:22:32 +02:00
Henry Jameson
eb00fea508 Merge remote-tracking branch 'origin/develop' into shigusegubu
* origin/develop: (116 commits)
  streamer group & Oban crontab child
  Update PleromaFE bundle for the 2.0 release
  Update AdminFE build
  add confirm field to filtered params
  Admin API: Exclude boosts from `GET /api/pleroma/admin/users/:nickname/statuses` and `GET /api/pleroma/admin/instance/:instance/statuses`
  Admin API: `GET /api/pleroma/admin/statuses` - list all statuses (accepts `godmode` and `local_only`)
  unnecessary groups
  instance.gen task: make example instance name less confusing
  instance.gen task: remind to transfer the config to the database after migrations
  instance.gen task: make instance name default to the domain
  Update AdminFE build
  Fix Dialyzer warnings
  Add a test to ensure OAuth tokens are tied to Push subscriptions
  compile fix
  instance.gen task: fix crash when using custom static directory
  Admin API: `GET /api/pleroma/admin/stats` to get status count by visibility scope
  DOCS Theming your instance
  Captcha: return invalid when answer_data is nil
  captcha_test.exs: Use the same testing logic in Kocaptcha and native
  Add missing invites_enabled and account_activation_required settings
  ...
2020-02-29 15:19:33 +02:00
Henry Jameson
239f4d56bd update MRF 2020-02-09 21:30:43 +02:00
Henry Jameson
192426b485 Merge remote-tracking branch 'origin/develop' into shigusegubu
* origin/develop: (63 commits)
  Fix email mix task on OTP releases
  Actually fix upload limit on OTP releases
  Questions: Add timezone to `closed` property
  deps: update plug to 1.9
  Add User.get_follow_state/2
  fix
  EmojiReactions: Rename to EmojiReacts
  Update FE bundle
  Update CHANGELOG
  Cancellation of a follow request for a remote user
  Simplify in-database config docs
  description change
  dropdown type
  removing confusing error
  Apply suggestion to CHANGELOG.md
  removing migrate_from_db endpoint from admin api
  Remove AutoLinker `scheme` option from the config
  Add support for cancellation of a follow request
  Add cheatsheet entry
  fix not being able to pin polls
  ...
2020-02-09 21:28:21 +02:00
Henry Jameson
43ea736c37 Merge remote-tracking branch 'origin/develop' into shigusegubu
* origin/develop: (466 commits)
  Fix compatibility with Elixir v1.10
  Add test for custom base_url when deleting an attachment
  Fix base_url string trimming
  Add logging
  Remove `whole_db` parameter everywhere, it's not used anymore
  Fix __MODULE__ usage
  DOCS General update for the "Introduction to Pleroma" section
  update ecto
  Remove unused var
  explicitly describe perform op in AttachmentsClenupWorker
  Remove user recommendation by third party engine
  little fixes
  Fix typo
  description typos, Oban verbose type fix, new keys
  can be changed in runtime
  respect settings from database in mix tasks
  Document dynamic_configuration breaking change
  Emoji reactions: Update docs and changelog
  Emoji reactions: Change api format once more
  fix for non existing atom
  ...
2020-01-28 18:07:04 +02:00
Henry Jameson
830e18a702 Merge remote-tracking branch 'origin/develop' into shigusegubu
* origin/develop: (734 commits)
  update fast sanitize dependency
  streamer: use direct object for filter checks when there is no valid child object in an activity
  Bump fast_sanitize version
  Fix moderation log crash
  Undo dialyzer fix
  Fix count
  AdminAPI: Omit relay user from users list
  Fix "the call ... will never return" warning
  Bump fast_sanitize dependency so this builds on more than just Linux
  Remove following column from the migrations
  Update test for get_recipients_from_activity
  Fix bookmark migration using a query with a schema
  Add a migration to fix blocked follows
  Fix duplicate recipients
  Rip out the rest of htmlsanitizeex
  Remove commented-out code
  Fix XSS emoji test
  Bump fast_sanitize dependency
  Fix two migrations sharing the same module name
  Migrate missing follow requests
  ...
2019-11-04 11:43:40 +02:00
Henry Jameson
0dd79c283c Merge remote-tracking branch 'origin/develop' into shigusegubu
* origin/develop: (59 commits)
  Fix OAuth cleanup worker unconditionally starting
  Parallelize template rendering
  Collect stats immediately after init
  Cache follow state
  Add a task to benchmark timeline rendering
  html.ex: Allow sub and sup elements by default
  Apply suggestion to lib/pleroma/web/activity_pub/publisher.ex
  activitypub: publisher: add (request-target) to http signature when POSTing
  MRF: fix up unserializable option lists in describe implementations
  fix formatting
  Implement Pleroma.Stats as GenServer
  streamline Streamer pings
  Isolate OAuth.Token.CleanWorker
  use default child_specs
  Conversations: Load relations in one query.
  Switch to pre-1.8 version of tzdata.
  Conversation: Render new participation on update.
  Conversations: Use correct oauth paths for extended api.
  update changelog to cover MRF describe API.
  Preload thread mutes/bookmarks in user_statuses
  ...
2019-08-17 12:12:32 +03:00
Henry Jameson
c8b2534245 Merge remote-tracking branch 'origin/develop' into shigusegubu
* origin/develop: (302 commits)
  MRF: ensure that subdomain_match calls are case-insensitive
  Strip internal fields including likes from incoming and outgoing activities
  tests for Pleroma.Uploaders
  Mastodon API: Fix thread mute detection
  Uploader.S3 added support stream uploads
  Mastodon API: Set follower/following counters to 0 when hiding followers/following is enabled
  Return profile URL in MastodonAPI's `url` field
  Simplify logic to mention.js `url` field
  Return profile URL when available instead of actor URI for MastodonAPI mention URL
  Do not rembed the object after updating it
  OStatus tests: stop relying on embedded objects
  ActivityPub tests: remove assertions of embedded object being updated, because the objects are no longer supposed to be embedded
  OStatus Announce Representer: Do not depend on the object being embedded in the Create activity
  Stop depending on the embedded object in restrict_favorited_by
  [#1150] fixed parser TwitterCard
  tests for CommonApi/Utils
  Remove Reply-To from report emails
  Do not add the "next" key to likes.json if there is no more items
  Replace "impode" with "implode" for
  Remove longfox emoji set
  ...
2019-08-11 16:58:09 +03:00
Henry Jameson
ae4d15503b Merge remote-tracking branch 'origin/develop' into shigusegubu
* origin/develop: (159 commits)
  [#1043] fix search accounts.
  tasks/pleroma/instance.ex: Change :upload_dir to :uploads_dir
  Expose `skip_thread_containment` in nodeinfo
  Split alters rather than work with indexes
  Use fallback values for search queries
  Fix migration
  [#1048] Fixed version parsing in pleroma_ctl. Closes #1036.
  [#1048] Resolved violations of SemVer version format. Refactoring.
  Add fallback value to the admin report view.
  Move changelog entries
  [#1033] Fix database migrations
  Update changelog and admin API docs with tags, display_name, avatar additions
  OTP Release install docs: Remove --dry-run in cron certbot command
  Add hashtag filter to user statuses (GET /api/v1/accounts/:id/statuses)
  [#1026] Filter.AnonymizeFilename added ability to retain file extension with custom text
  Fix not being able to pin unlisted posts
  Add PLEROMA_BUILD_ENV to override env for the version generator and use it in the CI for building docs
  Add a caveat for docker deployment in the config docs
  Revert "Build releases only on tags or develop"
  Build releases only on tags or develop
  ...
2019-07-06 21:54:28 +03:00
Henry Jameson
2faac1cc48 Merge remote-tracking branch 'origin/develop' into shigusegubu
* origin/develop: (36 commits)
  [#570] add user:notification stream
  fix for new instances
  no print version to the shell
  OEmbed.OEmbedController does not exist in the Pleroma codebase. It was removed in commit 92c5640f and this leftover artifact breaks compiling now.
  Update Phoenix to 1.4.8
  Apply suggestion to CHANGELOG.md
  Documentation: Document chat token response.
  Changelog: Document chat token.
  Mastodon API: Return the token needed for the chat.
  bugfix
  little fix
  version generation
  it is changed in compile time
  Fix rate limit test
  [#948] /api/v1/account_search added optional parameters (limit, offset, following)
  Fix hashtags being picked up by rich media parser
  Add copyright info to containment.ex
  Mastodon API: Document changes.
  MastodonAPI: Add a way to update the background image.
  Improve rate limiter documentation
  ...
2019-06-16 14:25:39 +03:00
Henry Jameson
f0e2fb1609 Merge remote-tracking branch 'origin/develop' into shigusegubu
* origin/develop: (193 commits)
  Remove search result order for non-RUM indexes
  Update `auto_linker` dependency
  Document TagPolicy in `rewrite_policy` section
  Import release config from env variable or /etc/pleroma/config.exs and warn if the file is missing
  Add option to restrict all users to local content
  Better default parameters for suggestion
  Update `plug` dependency
  Update `ex_rated` dependency
  Replace `MastodonAPIController.account_register/2` rate limiter
  Update CHANGELOG
  Add rate limiting for search endpoints
  Add RateLimiter
  Remove unused imports and aliases from migration
  Update pleroma_ctl
  Add more tests for using media_proxy and whitelists
  Add a changelog entry for releases
  specify that a version is needed for rollback
  Add migrate/rollback to release tasks
  Fix wrong placement of serve_endpoints
  Use Mix.shell().yes? if available
  ...
2019-06-12 22:20:20 +03:00
Henry Jameson
e7ff752c52 Merge remote-tracking branch 'origin/develop' into shigusegubu
* origin/develop: (218 commits)
  http: bump connection timeout to 10 seconds
  Fix prometheus-ecto error when not configured
  Document MRF.Simple :report_removal
  Add virtual :thread_muted? field
  Move default mascot configuration to `config/`
  Add changelog entry for mascot config
  Use string map for default mascot
  Format mascot tests
  Add mascot get/set tests
  Add API endpoints for a custom user mascot
  Add report filtering to MRF.SimplePolicy
  add Changelog entry
  also suppress link previews from posts marked #nsfw
  add CHANGELOG entry
  config: make sending the user agent configurable, disable sending the user agent in tests
  http: request builder: send user-agent when making requests
  rich media: suppress link previews if post is marked as sensitive
  mrf: simple policy: mark all posts instead of posts with media as sensitive if they match media_nsfw
  CI: Use the correct image with the correct hostname.
  RUM: Set rum status by the environment.
  ...
2019-05-22 00:02:44 +03:00
Henry Jameson
733b53748c more mrf 2019-05-05 23:57:11 +03:00
Henry Jameson
a506b7e1d7 undo priv_sid hacks 2019-05-04 15:28:27 +03:00
Henry Jameson
232dd79341 updates 2019-04-28 18:32:58 +03:00
Henry Jameson
10d743e46a Merge remote-tracking branch 'origin/develop' into shigusegubu
* origin/develop:
  Fix bookmarks depending on embeded object and move checking if the status is bookmarked to SQL
  update pleroma frontend
  tests: fix up for changed bbcode library output and verify html is properly escaped
  add support for bbcode
  mix: add bbcode dependency
  update Changelog
  Add mediaproxy whitelist capability
  Move settings to Source subentity
  test fixes
  fixes for tests
  migration without using old field name
  unused
  removing useless transaction
  migration optimization
  changelog file update
  favourites add bookmark display
  migrate user.bookmarks to separate table
  bookmarks in separate table
  activitypub: transmogrifier: send reject follow if following does not succeed
  Fix leaking private configuration parameters in Mastodon and Twitter APIs, and add new configuration parameters to Mastodon API
2019-04-28 18:29:15 +03:00
Henry Jameson
5015d517d0 Merge remote-tracking branch 'origin/develop' into shigusegubu
* origin/develop: (184 commits)
  html: lock down allowed class attributes to only those related to microformats
  Extend Mastodon API with public endpoint for getting Favorites timeline of any user (#789)
  Add :emoji settings to config.md
  added healthcheck setting to instance config
  Add shortcode_globs setting to documentation
  Add a changelog entry for `pleroma.in_reply_to_account_acct`
  Add `pleroma.in_reply_to_account_acct` to MastoAPI status entity
  Replace Object.normalize(activity.data[object] with Object.normalize(acitivty) to benefit from preloading
  Fix unclosed ` and put synopsis into a code block in pleroma.emoji mix task docs
  Use `User.get_cached*` everywhere
  Feature/826 healthcheck endpoint
  Fix emoji.txt / custom_emoji.txt / shortcode_globs handling
  Formatting
  Change the default manifest to pleroma's namespace
  Replace MD5 with SHA256 for emoji pack verification
  Wrap the docstrings to 70 characters
  differences_in_mastoapi_responses.md: `content_type` parameter of post submission
  [#923] Refactored OAuthController#authorize definitions, added test.
  Set correct values in the MastoAPI reblog status view
  Mention Mastodon 2.8+ follow import fix in changelog
  ...
2019-04-24 02:38:41 +03:00
Henry Jameson
217efb4ce0 Merge remote-tracking branch 'origin/develop' into shigusegubu
* origin/develop: (36 commits)
  update the follower count when a follower is blocked
  adding language tag
  AdminApiControllerTest unused variables fix.
  [#923] Removed <br> elements from auth forms, adjusted docs, minor auth settings refactoring.
  Add scheduler for sending scheduled activities to the queue
  Added limits and media attachments for scheduled activities.
  Handle `scheduled_at` on status creation.
  Add scheduled activities
  fix credo
  Use PleromaJobQueue in Pleroma.Web.Push
  [#923] OAuth consumer mode refactoring, new tests, tests adjustments, readme.
  [#923] OAuthController#callback adjustments (with tests).
  [#923] OAuth consumer controller tests. Misc. improvements.
  Improve Transmogrifier.upgrade_user_from_ap_id/2
  second level of headertext change in doc
  syntax highlighting
  test fix
  little changes and typos
  updating custom_emoji docs
  refactoring of emoji tags config to use groups
  ...
2019-04-09 21:33:18 +03:00
Henry Jameson
325c4b0a9f Merge remote-tracking branch 'origin/develop' into shigusegubu
* origin/develop:
  Return 403 on oauth token exchange for a deactivated user
2019-04-07 12:20:20 +03:00
Henry Jameson
4069f6430d update mrf 2019-04-07 12:13:49 +03:00
Henry Jameson
22bb706770 Merge remote-tracking branch 'origin/develop' into shigusegubu
* origin/develop: (87 commits)
  Pin recon dependency to 2.4.0
  Redirect to the referer url after mastofe authorization
  Mock :crypt.crypt/2 because otherwise the test fails on Mac OS
  Revert "Merge branch 'test-coverage' into 'develop'"
  Use --cover option when running CI tests
  We actually want the user id not nickname in the test...
  Also remove Repo functions in the tests
  Redundant Repo.get_by usage was recently removed from the codebase
  Document the admin API endpoints for controlling follow/unfollow
  Add user following / unfollowing to the admin api.
  Refactor html caching functions to have a key instead of a module, use more correct terminology and fix summaries in mastoapi
  Add ability to ship logs to a Slack channel
  Code readability tweak
  Clean merge crumbs
  Serve metrics at `/api/pleroma/app_metrics`
  Document Prometheus
  [#1] fix telemetry
  Set up telemetry and prometheus
  Add recon
  mastodon_api_controller.ex: Add pleroma-tan to initial_state
  ...
2019-04-06 22:24:38 +03:00
Henry Jameson
5f41c54d8c Merge remote-tracking branch 'origin/develop' into shigusegubu
* origin/develop:
  Fix muting reblogs tests
  Fix missing announces in MastoAPI home timeline
  Add more user filters + move search to its own module
  Add vapid_key to the `POST /api/v1/apps` response
  Add GET /api/v1/apps/verify_credentials
2019-03-27 21:36:59 +02:00
Henry Jameson
3af3e07312 Merge remote-tracking branch 'origin/develop' into shigusegubu
* origin/develop: (55 commits)
  AP UserView: Refactor banner / avatar display code, add test.
  Test for MastoAPI /api/v1/instance response structure (formatting fix).
  Test for MastoAPI /api/v1/instance response structure.
  Credo is upset about me not remembering the alphabet
  Fix formatting
  Remove ActivityRepresenter
  Mastodon 2.7.2 instance attributes (registrations, languages).
  Increment replies_count on replies (MastoAPI)
  Comments split.
  Mastodon-based auth error messages. Defaulted User#auth_active?/1 to `true`.
  Try sending an empty map
  Attempt to fix incorrect federation of default instance avatars
  Add an id index to notifications
  fix up missing announcements with preloads
  Serve non-public activities in /api/v1/favourites
  add overriding truncated_namespace condition for truncating paths for digital ocean
  mrf/keyword_policy.ex: Fix when summary == nil, do not whitelist content == nil
  tests: fix up activity collision test
  activity: use left join instead of inner join when fetching activities that may or may not have a child object
  user: use preloads when deleting accounts
  ...
2019-03-26 21:48:12 +02:00
Henry Jameson
c7ccd43500 shitfuck 2019-03-21 20:39:46 +02:00
Henry Jameson
580787d360 piece of shit 2019-03-21 20:35:52 +02:00
Henry Jameson
9bb34a12eb Merge remote-tracking branch 'origin/develop' into shigusegubu
* origin/develop: (87 commits)
  Add a gopher url port config option
  modify the migrations to use naive_datetime_usec
  Fix filter migration
  Fix migration timestamp type
  Ecto 3.0.5 migration
  Update frontend
  Format
  Use ILIKE to search users
  transmogrifier: upgrade: when upgrading OStatus users to AP, ensure we always use the fake collection
  user: properly cope with actors which do not declare a followers collection
  transmogrifier: when determining followers collection URI, we may need to fetch the actor
  test: add test for list sanitization
  tests: add test for as:Public issues
  activitypub: transmogrifier: do not allow missing lists to be interpreted as nil
  activitypub: transmogrifier: ensure as:Public activities are delivered to followers
  fix UploadTest to use new image_tmp.jpg
  used imageOptim to reduce size of image files
  Document additional pleroma changes to /api/v1/accounts/:id
  Check if the user has indeed not been federated with
  Added support for exclude_types, limit, and min_id in Mastodon notifications.
  ...
2019-03-21 20:26:26 +02:00
Henry Jameson
a9eb20e2db Merge remote-tracking branch 'origin/develop' into shigusegubu
* origin/develop: (24 commits)
  MastoAPI followers/following endpoints
  Switch the CI to Elixir 1.8.1
  Linting.
  WebPush: Add activity id to the push messages.
  MastoAPI Accounts: Add fetching by nickname.
  Update Differences-in-MastodonAPI-Responses.md
  Remove chromium input hilight that clashes with our own
  Style again the login page to fit pleroma more
  MastoAPI StatusView: Add locality indicator.
  Broadcast deleted activity id on deletion to conform to MastoAPI streamig spec
  Change order of source code to align with platforms
  Update homepages and provide source code links for Roma apps in Clients.md
  Rename Mastalab -> Fedilab in Clients.md
  http: connection: unify adapter configuration and defaults
  http: connection: relax the timeouts a little
  http: rework connection timeouts to match hackney docs, enforce 1 second max TCP connection timeout
  http: actually pass the options list to the Connection factory
  http: connection: merge hackney option lists instead of concatenating them
  http: safely catch erlang exits and elixir errors from hackney (ref #672)
  Allow an admin to delete a user status
  ...
2019-03-12 21:50:45 +02:00
Henry Jameson
66185ad957 Merge remote-tracking branch 'origin/develop' into shigusegubu
* origin/develop: (62 commits)
  update pleroma frontend
  tests: add regression test
  MRF: anti followbot: gracefully handle accounts without a display name
  Adjust delete activity audience to match the deleted object
  Revert existing object check
  Preserve parameters in link headers (Mastodon API)
  [#647] tests for web push
  Keep heading short
  Add default config for masto_fe
  Add handling of objects not in database
  Add tests for reserved char escaping in upload
  Properly escape reserved URI charachters in upload urls
  Web.RelMe: Fix having other values in rel attr
  Plugs.HTTPSecurityPlug: Add static_url to CSP's connect-src
  Include admins in nodeinfo
  Typo
  rich media: helpers: rework validate_page_url()
  local -> only_local
  Format & update docs
  helpers: use AutoLinker to validate URIs as well as the other tests
  ...
2019-03-07 19:54:48 +02:00
Henry Jameson
f95b354c3d configs update 2019-03-03 21:33:48 +02:00
Henry Jameson
af8a7d8fd8 limit 2019-03-02 20:25:21 +02:00
Henry Jameson
ae07bb4779 Merge remote-tracking branch 'origin/develop' into shigusegubu
* origin/develop: (208 commits)
  Web.OAuth.OAuthControllerTest: Add test against token formatting
  Web.OAuth.OAuthController: Fix scopes Enum.join for OAuth response
  activitypub: fix date header format
  Added migration for setting default tags in existing users records
  config: fix chat endpoint path
  mastodon websocket: return errors using ok, not stop
  mastodon websocket: bring back infinity timeout
  mastodon websocket: use pattern match to get query data, robustly handle errors
  config: update config for cowboy 2 endpoints
  mastodon api: websocket: update code for cowboy 2.x
  mix: update dependencies for cowboy 2.0
  Renamed *DatabaseAuthenticator to *Authenticator.
  Added `auth_template/0` to DatabaseAuthenticator.
  Made auth customization be runtime-configurable.
  Added deactivated to the user view
  Remove parts of the old activity view.
  Add user muted status info to twitterapi.
  Add user muted status info to MastodonAPI.
  Add `with_muted` param.
  Follower requests: Utilize object index.
  ...
2019-03-02 20:20:45 +02:00
Henry Jameson
f1bb6b6bc4 Merge remote-tracking branch 'origin/develop' into shigusegubu
* origin/develop: (280 commits)
  Mark streaming feature for Apps in README.md
  Update README.md
  hide_followings was renamed to hide_followers in the FE, but never synced up in the BE
  tests: add a rich media card that contains all relevant fields
  test: add some regression tests for the rich media card rendering
  mastodon api: rich media: don't clobber %URI struct with a string
  adds a couple of explicit examples for ExSyslogger
  Fix if clause in activity_pub user_view
  rids the duplicate timestamp from default ExSyslogger config
  update frontend
  Allow to configure visibility for admin and moderator badges
  Add is_admin and is_moderator boolean fields to the user view
  rich media: parser: reject any data which cannot be explicitly encoded into JSON
  test: twitterapi: fix another possible test failure case
  test: twitterapi: fix the test breakage for real
  mastodon api: fix rendering of cards without image URLs (closes #597)
  Fix SQL
  ARGLE GARBLE
  html: don't attempt to parse nil content
  activitypub: transmogrifier: fix bare tags
  ...
2019-02-08 10:08:36 +02:00
Henry Jameson
37aa9a63b0 allow only plaintext 2019-01-21 15:52:44 +03:00
Henry Jameson
f314d1b9d5 Merge remote-tracking branch 'origin/develop' into shigusegubu
* origin/develop: (194 commits)
  Mix.Tasks.Pleroma.Instance: Generate signing_salt
  Send delete event over Mastodon streaming api
  Add a test to ensure #39 is fixed.
  update frontend
  Set custom similarity limit.
  Make use of the indices.
  test: add regression test for to/cc clobbering
  [#477] User trigram index adjustment.
  [#477] User: FTS and trigram search results mixing (to handle misspelled requests).
  [#491] Made full nicknames be preserved in user links text only in Bio.
  activitypub: add a match clause for objects, not just activities
  activitypub: transmogrifier: do not clobber the addressing on relayed announcements
  activitypub: allow is_public?() to work on any type of map representing an AS2 object
  activitypub: relay: chase selective public announce changes
  activitypub: announce: add new public parameter
  Add comments and change default path of the Mix binary.
  Fix bad link in likes collection
  [#502] Fixed `user_count` in `/api/v1/instance` to include only active local users.
  formatting
  Default to disabled in the code in case the setting is absent from config.exs
  ...
2019-01-21 14:35:25 +03:00
Henry Jameson
6cf02b501a Merge remote-tracking branch 'origin/develop' into shigusegubu
* origin/develop: (53 commits)
  tests: add legal boilerplate
  mix tasks: add legal boilerplate
  add license boilerplate to pleroma core
  tests: twitter api: add test proving that peertube videos are correctly handled
  twitter api: add "Video" to supported activity types list
  tests: twitter api: activity view test: enable tesla mock
  twitter api: activity representer: remove peertube hack
  tests: mastodon api: add test verifying that peertube videos are correctly rendered
  mastodon api: status view: remove obsolete peertube hack
  transmogrifier: significantly rework handling of peertube videos, add test
  transmogrifier: When it’s a Video move "url" to "attachment"
  Implement kaniini's tweaks
  Renamed the things
  Add documentation
  Fix formatting
  Implement large thread filter
  [#114] Fixed test.
  [#114] Allowed unconfirmed users to authenticate if :account_activation_required is disabled prior to confirmation. Ensured that no confirmation emails are sent if :account_activation_required is not true. Adjusted tests.
  [#114] Added :user_id component to email confirmation path to improve the security. Added tests for `confirm_email` action.
  [#114] Removed flash messages rendering on redirects.
  ...
2018-12-26 10:25:38 +03:00
Henry Jameson
4349a83b9d Merge remote-tracking branch 'origin/develop' into shigusegubu
* origin/develop: (295 commits)
  update frontend
  Fix uploads test.
  fix text field
  don't re-use build
  Fix tagging problems for existing instances.
  Alias Kocaptcha in the test
  Use :ets.match_delete to delete old captchas
  Switch to phoenixframework/phoenix as the needed change is merged.
  Integration tests for mastodon websocket
  Cowboy handler for Mastodon WebSocket
  Support both OAuth token record and token string in UserView
  minutes->seconds_retained in config.md
  Clean captchas up periodically, not schedule it after theyre created
  Fix captcha tests
  Change minutes_retained config to seconds_retained
  Make the hosted kocaptcha the default value
  Add a configurable auto-cleanup for captchas
  More put_view.
  Use bindings dbuser and dbname in sample_psql.eex
  Upgrade to Phoenix 1.4
  ...
2018-12-18 07:32:00 +03:00
Henry Jameson
f077d41b12 Merge remote-tracking branch 'origin/develop' into shigusegubu
* origin/develop: (92 commits)
  Web.MastodonApi.MastodonSocketTest: Add test for unauthenticated websocket
  Web.Streamer: Get unauthenticated statuses representation
  Web.MastodonAPI.MastodonSocket: Put access_token at function-level
  Web.MastodonAPI.MastodonSocket: Add unauthentified websocket endpoints
  Improved version string
  mediaproxy: fix empty url & add some tests
  RetryQueue: tiny refractor, add tests
  Various runtime configuration fixes
  update pleroma frontend
  Federator: add retry queue.
  activitypub: object view: avoid leaking private details
  ostatus controller: respond with AS2 objects instead of activities to notice URIs
  tests: federator: fix formatting
  activitypub: transmogrifier: make deletes secure
  Web.AdminAPI.AdminAPIControllerTest: New Test
  Web.AdminAPI.AdminAPIController: Fixes bugs found with ExUnit
  test/plugs/user_is_admin_plug_test: New test
  lib/mix/tasks/relay*: Use a with block
  Change Relay from `status` to `{status, message}`
  Web.Router: Change right to permission group (except for function names)
  ...
2018-11-26 17:52:07 +03:00
Henry Jameson
08ab82cf0b fix 2018-11-12 16:26:43 +03:00
Henry Jameson
bc0f261f72 Merge remote-tracking branch 'origin/develop' into shigusegubu
* origin/develop: (207 commits)
  Update README.md
  Mastodon API: Fix list streaming
  nginx example config: remove CORS headers, now managed by CORSPlug.
  config: properly configure CORSPlug.
  oauth: fix token decode regression
  tests: add test for internal data stripping
  activitypub: transmogrifier: sanitize internal representation details from outgoing objects
  lib/mix/tasks: s/@doc/@moduledoc/
  lib/mix/tasks/unsubscribe_user.ex: Fix syntax from bad line copy
  lib/mix/tasks: Add remaining documentation for mix tasks
  config/config.md: Add lines inspired/copied from CONFIGURATION.md
  README.md: Add note about config/config.md
  README.md: Put the systemd’s .service note to the relevant section
  README.md: Add note for OpenRC
  config/config.md: scope_options_enabled also addresses subject
  config/config.md: Fill all the blanks
  config/config.md: Complete it [WIP]
  config/config.md: Create
  Document the mix tasks in ex_doc instead
  Document mix tasks
  ...
2018-11-12 16:17:34 +03:00
Henry Jameson
d5e4b906c9 Merge remote-tracking branch 'origin/develop' into shigusegubu
* origin/develop: (129 commits)
  Uploaders.S3: Replace unsafe characters in object key
  update pleroma frontend
  test: add smoketests for the scrubbing policies
  html: twittertext: add missing catchall scrub function
  twitter api: add no_rich_text option to userview for account prefs
  test: add tests for new User.html_filter_policy()
  mastodon api: formatting
  twitter api: add support for disabling rich text
  mastodon api: add support for user-supplied html policy
  twitter api: add support for user-specified html policy
  user: add User.html_filter_policy()
  html: default to using normal scrub policy if provided scrub policy is nil
  mix: remove fix_ap_users task, now obsolete
  test: add test proving that users are refreshed when stale
  user: implement dynamic refresh of profiles (gets rid of need for fix_ap_users task)
  Update mastodon frontend
  [Pleroma.Web.MastodonAPI.MastodonAPIController]: Bump mastodon_api_level to 2.5.0
  [Pleroma.Web.MastodonAPI.MastodonAPIController]: Remove unused variables
  [Pleroma.Web.Router]: Fake /api/v1/endorsements
  [Pleroma.Web.MastodonAPI.AccountView]: relationship.json: fake endorsed value (false)
  ...
2018-09-25 16:18:28 +03:00
Henry Jameson
5720cf286c changes 2018-09-25 15:56:43 +03:00
SGSGB
5379db3194 Merge remote-tracking branch 'origin/develop' into shigusegubu 2018-08-29 21:56:22 +02:00
SGSGB
dae06c0944 Merge remote-tracking branch 'origin/develop' into shigusegubu 2018-08-29 12:08:34 +02:00
SGSGB
00296406fa Merge remote-tracking branch 'origin/develop' into shigusegubu 2018-08-13 08:07:20 +02:00
SGSGB
2c15ffb421 Merge remote-tracking branch 'origin/develop' into shigusegubu 2018-08-04 18:24:38 +02:00
SGSGB
21e6c1dfcb customs 2018-08-04 18:23:11 +02:00
SGSGB
d5f36acd13 emoji movement 2018-07-06 18:59:07 +02:00
Pleroma
fe8ec1b6f9 shigusegubu customs 2018-07-06 18:59:00 +02:00
12 changed files with 202 additions and 45 deletions

View file

@ -26,10 +26,10 @@ cache: &global_cache_policy
- _build
stages:
- check-changelog
- build
- lint
- test
- check-changelog
- benchmark
- deploy
- release

View file

View file

@ -0,0 +1 @@
Set default values on validators for transient objects (attachment, poll options)

View file

@ -64,7 +64,7 @@ config :pleroma, Pleroma.Upload,
link_name: false,
proxy_remote: false,
filename_display_max_length: 30,
default_description: nil,
default_description: :filename,
base_url: nil
config :pleroma, Pleroma.Uploaders.Local, uploads: "uploads"
@ -157,18 +157,18 @@ config :pleroma, :http,
adapter: []
config :pleroma, :instance,
name: "Pleroma",
email: "example@example.com",
notify_email: "noreply@example.com",
description: "Pleroma: An efficient and flexible fediverse server",
short_description: "",
name: "Shigusegubu",
email: "pleroma@hjkos.com",
notify_email: "pleroma@hjkos.com",
description: "SigSegV, a pleroma instance",
short_description: "HJ's semi-personal instance",
background_image: "/images/city.jpg",
instance_thumbnail: "/instance/thumbnail.jpeg",
favicon: "/favicon.png",
limit: 5_000,
description_limit: 5_000,
remote_limit: 100_000,
upload_limit: 16_000_000,
upload_limit: 200_000_000,
avatar_upload_limit: 2_000_000,
background_upload_limit: 4_000_000,
banner_upload_limit: 4_000_000,
@ -187,18 +187,16 @@ config :pleroma, :instance,
federation_reachability_timeout_days: 7,
allow_relay: true,
public: true,
quarantined_instances: [],
quarantined_instances: [{ "pleroma.rareome.ga", "leaks private posts or sumshit i dont rember" }],
static_dir: "instance/static/",
allowed_post_formats: [
"text/plain",
"text/html",
"text/markdown",
"text/bbcode"
],
autofollowed_nicknames: [],
autofollowing_nicknames: [],
max_pinned_statuses: 1,
attachment_links: false,
attachment_links: true,
max_report_comment_size: 1000,
report_strip_status: true,
safe_dm_mentions: false,
@ -291,8 +289,8 @@ config :pleroma, :markup,
config :pleroma, :frontend_configurations,
pleroma_fe: %{
alwaysShowSubjectInput: true,
background: "/images/city.jpg",
alwaysShowSubjectInput: false,
background: "/static/sigsegv_s.png",
collapseMessageWithSubject: false,
disableChat: false,
greentext: false,
@ -305,18 +303,18 @@ config :pleroma, :frontend_configurations,
logo: "/static/logo.svg",
logoMargin: ".1em",
logoMask: true,
minimalScopesMode: false,
minimalScopesMode: true,
noAttachmentLinks: false,
nsfwCensorImage: "",
postContentType: "text/plain",
redirectRootLogin: "/main/friends",
redirectRootNoLogin: "/main/all",
scopeCopy: true,
scopeCopy: false,
sidebarRight: false,
showFeaturesPanel: true,
showInstanceSpecificPanel: false,
subjectLineBehavior: "email",
theme: "pleroma-dark",
showInstanceSpecificPanel: true,
subjectLineBehavior: "noop",
theme: "sigsegv2",
webPushNotifications: false
}
@ -372,8 +370,23 @@ config :pleroma, :mrf_hellthread,
config :pleroma, :mrf_simple,
media_removal: [],
media_nsfw: [],
federated_timeline_removal: [],
media_nsfw: [
{ "preteengirls.biz", "pron or even cp" },
{ "melalandia.tk", "i don't rember" },
{ "pl.smuglo.li", "instance is dead but i still remember, rip smuglo" },
{ "baraag.net", "pron" },
{ "humblr.social", "3dpd pron" },
{ "pawoo.net", "tasteful pron, mostly." },
{ "sinblr.com", "3dpd pron" }
],
federated_timeline_removal: [
{ "preteengirls.biz", "pron or even cp" },
{ "melalandia.tk", "i don't rember" },
{ "baraag.net", "pron" },
{ "humblr.social", "3dpd pron" },
{ "pawoo.net", "tasteful pron, mostly." },
{ "sinblr.com", "3dpd pron" }
],
report_removal: [],
reject: [],
followers_only: [],
@ -466,7 +479,7 @@ config :pleroma, :media_preview_proxy,
min_content_length: 100 * 1024
config :pleroma, :shout,
enabled: true,
enabled: false,
limit: 5_000
config :phoenix, :format_encoders, json: Jason, "activity+json": Jason
@ -796,7 +809,7 @@ config :pleroma, :web_cache_ttl,
config :pleroma, :modules, runtime_dir: "instance/modules"
config :pleroma, configurable_from_database: false
config :pleroma, configurable_from_database: true
config :pleroma, Pleroma.Repo,
parameters: [gin_fuzzy_search_limit: "500", jit: "off"],
@ -860,8 +873,11 @@ config :pleroma, Pleroma.Web.ApiSpec.CastAndValidate, strict: false
config :pleroma, :mrf,
policies: [
Pleroma.Web.ActivityPub.MRF.ObjectAgePolicy,
Pleroma.Web.ActivityPub.MRF.SimplePolicy,
Pleroma.Web.ActivityPub.MRF.HellthreadPolicy,
Pleroma.Web.ActivityPub.MRF.AntiFollowbotPolicy,
Pleroma.Web.ActivityPub.MRF.TagPolicy,
Pleroma.Web.ActivityPub.MRF.ObjectAgePolicy,
Pleroma.Web.ActivityPub.MRF.InlineQuotePolicy
],
transparency: true,

115
config/custom_emoji.txt Normal file
View file

@ -0,0 +1,115 @@
Advanced_Sorcery, /emoji/sgsgb/Advanced_Sorcery.png
FACE_QUAD, /emoji/sgsgb/FACE_QUAD.png
Yukkuri_Reimu, /emoji/sgsgb/Yukkuri_Reimu.png
a_to, /emoji/sgsgb/a_to.png
angrypirds, /emoji/sgsgb/angrypirds.png
annoying_dog_hole, /emoji/sgsgb/annoying_dog_hole.png
award_bios, /emoji/sgsgb/award_bios.png
bananya, /emoji/sgsgb/bananya.png
bandits, /emoji/sgsgb/bandits.png
blobcatknife, /emoji/sgsgb/blobcatknife.png
cacolaugh, /emoji/sgsgb/cacolaugh.png
catboythink, /emoji/sgsgb/catboythink.png
cirno_run, /emoji/sgsgb/cirno_run.png
debian, /emoji/sgsgb/debian.png
denton, /emoji/sgsgb/denton.png
denton_laugh, /emoji/sgsgb/denton_laugh.png
dio, /emoji/sgsgb/dio.png
dogcited, /emoji/sgsgb/dogcited.png
dong, /emoji/sgsgb/dong.png
duane, /emoji/sgsgb/duane.png
e, /emoji/sgsgb/e.png
energy_star, /emoji/sgsgb/energy_star.png
flynn_smirk, /emoji/sgsgb/flynn_smirk.png
furrythink, /emoji/sgsgb/furrythink.png
granddad, /emoji/sgsgb/granddad.png
heavy_losingeh, /emoji/sgsgb/heavy_losingeh.png
heavy_winninggreat, /emoji/sgsgb/heavy_winninggreat.png
herrington, /emoji/sgsgb/herrington.png
hogan, /emoji/sgsgb/hogan.png
hyperjoy, /emoji/sgsgb/hyperjoy.png
itisamystery, /emoji/sgsgb/itisamystery.png
jacobson, /emoji/sgsgb/jacobson.png
jake, /emoji/sgsgb/jake.png
jyushimatsu_think, /emoji/sgsgb/jyushimatsu_think.png
kinzo, /emoji/sgsgb/kinzo.png
kms, /emoji/sgsgb/kms.png
kokoko, /emoji/sgsgb/kokoko.png
loss, /emoji/sgsgb/loss.png
luck, /emoji/sgsgb/luck.png
lucknorm, /emoji/sgsgb/lucknorm.png
marko, /emoji/sgsgb/marko.png
megaman, /emoji/sgsgb/megaman.png
miyanozoom, /emoji/sgsgb/miyanozoom.png
monster_energy_ultra, /emoji/sgsgb/monster_energy_ultra.png
moraledn, /emoji/sgsgb/moraledn.png
moraleup, /emoji/sgsgb/moraleup.png
multiply, /emoji/sgsgb/multiply.png
mycomputer, /emoji/sgsgb/mycomputer.png
necromancy1, /emoji/sgsgb/necromancy1.png
necromancy2, /emoji/sgsgb/necromancy2.png
necromancy3, /emoji/sgsgb/necromancy3.png
nice, /emoji/sgsgb/nice.png
nyoron, /emoji/sgsgb/nyoron.png
ohgno, /emoji/sgsgb/ohgno.png
ohyes, /emoji/sgsgb/ohyes.png
orangeman, /emoji/sgsgb/orangeman.png
payyap, /emoji/sgsgb/payyap.png
pooh, /emoji/sgsgb/pooh.png
poohington, /emoji/sgsgb/poohington.png
poptepipic1, /emoji/sgsgb/poptepipic1.png
poptepipic10, /emoji/sgsgb/poptepipic10.png
poptepipic11, /emoji/sgsgb/poptepipic11.png
poptepipic12, /emoji/sgsgb/poptepipic12.png
poptepipic13, /emoji/sgsgb/poptepipic13.png
poptepipic14, /emoji/sgsgb/poptepipic14.png
poptepipic15, /emoji/sgsgb/poptepipic15.png
poptepipic16, /emoji/sgsgb/poptepipic16.png
poptepipic17, /emoji/sgsgb/poptepipic17.png
poptepipic18, /emoji/sgsgb/poptepipic18.png
poptepipic19, /emoji/sgsgb/poptepipic19.png
poptepipic2, /emoji/sgsgb/poptepipic2.png
poptepipic20, /emoji/sgsgb/poptepipic20.png
poptepipic21, /emoji/sgsgb/poptepipic21.png
poptepipic22, /emoji/sgsgb/poptepipic22.png
poptepipic23, /emoji/sgsgb/poptepipic23.png
poptepipic3, /emoji/sgsgb/poptepipic3.png
poptepipic4, /emoji/sgsgb/poptepipic4.png
poptepipic5, /emoji/sgsgb/poptepipic5.png
poptepipic6, /emoji/sgsgb/poptepipic6.png
poptepipic7, /emoji/sgsgb/poptepipic7.png
poptepipic8, /emoji/sgsgb/poptepipic8.png
poptepipic9, /emoji/sgsgb/poptepipic9.png
puke, /emoji/sgsgb/puke.png
quake_net, /emoji/sgsgb/quake_net.png
quake_ram, /emoji/sgsgb/quake_ram.png
ranger, /emoji/sgsgb/ranger.png
ranger_none, /emoji/sgsgb/ranger_none.png
risitas1, /emoji/sgsgb/risitas1.png
risitas2, /emoji/sgsgb/risitas2.png
rokalife, /emoji/sgsgb/rokalife.png
sandro, /emoji/sgsgb/sandro.png
scut, /emoji/sgsgb/scut.png
serious, /emoji/sgsgb/serious.png
shag, /emoji/sgsgb/shag.png
shinitai_i, /emoji/sgsgb/shinitai_i.png
shinitai_ni, /emoji/sgsgb/shinitai_ni.png
shinitai_shi, /emoji/sgsgb/shinitai_shi.png
shinitai_ta, /emoji/sgsgb/shinitai_ta.png
shotging, /emoji/sgsgb/shotging.png
skelethor, /emoji/sgsgb/skelethor.png
smug_marisa, /emoji/sgsgb/smug_marisa.png
spurdo, /emoji/sgsgb/spurdo.png
stalkers, /emoji/sgsgb/stalkers.png
tenshi_eating_corndog, /emoji/sgsgb/tenshi_eating_corndog.png
thinkingwat, /emoji/sgsgb/thinkingwat.png
thnk, /emoji/sgsgb/thnk.png
tobdog, /emoji/sgsgb/tobdog.png
todd, /emoji/sgsgb/todd.png
trash, /emoji/sgsgb/trash.png
tuturu, /emoji/sgsgb/tuturu.png
tux, /emoji/sgsgb/tux.png
uwot, /emoji/sgsgb/uwot.png
uwot2, /emoji/sgsgb/uwot2.png
uwot3, /emoji/sgsgb/uwot3.png
vanpeek, /emoji/sgsgb/vanpeek.png

View file

@ -6,6 +6,7 @@ After=network.target postgresql.service
ExecReload=/bin/kill $MAINPID
KillMode=process
Restart=on-failure
StandardOutput=journal
; Name of the user that runs the Pleroma service.
User=pleroma
@ -14,9 +15,11 @@ Environment="MIX_ENV=prod"
; Make sure that all paths fit your installation.
; Path to the home directory of the user running the Pleroma service.
Environment="HOME=/var/lib/pleroma"
Environment="HOME=/home/pleroma"
; Path to the folder containing the Pleroma installation.
WorkingDirectory=/opt/pleroma
WorkingDirectory=/home/pleroma/pleroma
; Path to the environment file. the file contains RELEASE_COOKIE and etc
;EnvironmentFile=/opt/pleroma/config/pleroma.env
; Path to the Mix binary.
ExecStart=/usr/bin/mix phx.server
@ -24,7 +27,7 @@ ExecStart=/usr/bin/mix phx.server
; Use private /tmp and /var/tmp folders inside a new file system namespace, which are discarded after the process stops.
PrivateTmp=true
; The /home, /root, and /run/user folders can not be accessed by this service anymore. If your Pleroma user has its home folder in one of the restricted places, or use one of these folders as its working directory, you have to set this to false.
ProtectHome=true
ProtectHome=false
; Mount /usr, /boot, and /etc as read-only for processes invoked by this service.
ProtectSystem=full
; Sets up a new /dev mount for the process and only adds API pseudo devices like /dev/null, /dev/zero or /dev/random but not physical devices. Disabled by default because it may not work on devices like the Raspberry Pi.

View file

@ -90,6 +90,17 @@ defmodule Pleroma.Constants do
do: ~r/^[^[:cntrl:] ()<>@,;:\\"\/\[\]?=]+\/[^[:cntrl:] ()<>@,;:\\"\/\[\]?=]+(; .*)?$/
)
const(activity_json_canonical_mime_type,
do: "application/ld+json; profile=\"https://www.w3.org/ns/activitystreams\""
)
const(activity_json_mime_types,
do: [
"application/ld+json; profile=\"https://www.w3.org/ns/activitystreams\"",
"application/activity+json"
]
)
const(upload_object_types, do: ["Document", "Image"])
const(activity_json_canonical_mime_type,

View file

@ -12,13 +12,13 @@ defmodule Pleroma.Web.ActivityPub.ObjectValidators.AttachmentValidator do
@primary_key false
embedded_schema do
field(:id, :string)
field(:type, :string)
field(:type, :string, default: "Link")
field(:mediaType, ObjectValidators.MIME, default: "application/octet-stream")
field(:name, :string)
field(:blurhash, :string)
embeds_many :url, UrlObjectValidator, primary_key: false do
field(:type, :string)
field(:type, :string, default: "Link")
field(:href, ObjectValidators.Uri)
field(:mediaType, ObjectValidators.MIME, default: "application/octet-stream")
field(:width, :integer)

View file

@ -14,10 +14,10 @@ defmodule Pleroma.Web.ActivityPub.ObjectValidators.QuestionOptionsValidator do
embeds_one :replies, Replies, primary_key: false do
field(:totalItems, :integer)
field(:type, :string)
field(:type, :string, default: "Collection")
end
field(:type, :string)
field(:type, :string, default: "Note")
end
def changeset(struct, data) do

View file

@ -13,10 +13,8 @@ defmodule Pleroma.Web.PleromaAPI.BookmarkFolderView do
%{
id: folder.id |> to_string(),
name: folder.name,
emoji: get_emoji(folder.emoji),
source: %{
emoji: folder.emoji
}
emoji: folder.emoji,
emoji_url: get_emoji_url(folder.emoji)
}
end
@ -24,18 +22,18 @@ defmodule Pleroma.Web.PleromaAPI.BookmarkFolderView do
render_many(folders, __MODULE__, "show.json", Map.delete(opts, :folders))
end
defp get_emoji(nil) do
defp get_emoji_url(nil) do
nil
end
defp get_emoji(emoji) do
defp get_emoji_url(emoji) do
if Emoji.unicode?(emoji) do
emoji
nil
else
emoji = Emoji.get(emoji)
if emoji != nil do
Endpoint.url() |> URI.merge(emoji.relative_url) |> to_string()
Endpoint.url() |> URI.merge(emoji.file) |> to_string()
else
nil
end

View file

@ -33,9 +33,7 @@ defmodule Pleroma.Web.PleromaAPI.BookmarkFolderControllerTest do
"id" => ^folder_id,
"name" => "Bookmark folder",
"emoji" => nil,
"source" => %{
"emoji" => nil
}
"emoji_url" => nil
}
] = result
end
@ -57,9 +55,24 @@ defmodule Pleroma.Web.PleromaAPI.BookmarkFolderControllerTest do
assert %{
"name" => "Bookmark folder",
"emoji" => "📁",
"source" => %{
"emoji" => "📁"
}
"emoji_url" => nil
} = result
end
test "it creates a bookmark folder with custom emoji", %{conn: conn} do
result =
conn
|> put_req_header("content-type", "application/json")
|> post("/api/v1/pleroma/bookmark_folders", %{
name: "Bookmark folder",
emoji: ":firefox:"
})
|> json_response_and_validate_schema(200)
assert %{
"name" => "Bookmark folder",
"emoji" => ":firefox:",
"emoji_url" => "http://localhost:4001/emoji/Firefox.gif"
} = result
end