48f68fd133
Merge branch 'feature/mastoapi-new-config' into 'develop'
...
Fix leaking private configuration parameters in Mastodon and Twitter APIs, and add new configuration parameters to Mastodon API
This patch:
- Fixes `rights` in TwitterAPI ignoring `show_role`
- Fixes exposing default scope of the user to anyone in Mastodon API
- Extends Mastodon API to be able to show and set `no_rich_text`, `default_scope`, `hide_follows`, `hide_followers`, `hide_favorites` (requested by the FE in #674 )
Sorry in advance for 500 line one commit diff, I should have split it up to separate MRs
See merge request pleroma/pleroma!1093
5 years ago
24c3e2db2c
Add mediaproxy whitelist capability
5 years ago
dfc8425659
Move settings to Source subentity
5 years ago
a825056d4d
test fixes
5 years ago
85953c0836
fixes for tests
5 years ago
229ce6abbc
migration without using old field name
...
removing old field from db, after bookmarks migration
5 years ago
3c2ae80008
unused
5 years ago
c157e27a00
Merge branch 'develop' into feature/disable-account
5 years ago
1258128f4f
favourites add bookmark display
5 years ago
324c9c8ab5
migrate user.bookmarks to separate table
5 years ago
73d01857e3
bookmarks in separate table
5 years ago
0fd0ffcd76
activitypub: transmogrifier: send reject follow if following does not succeed
5 years ago
4baea6e6d9
Fix leaking private configuration parameters in Mastodon and Twitter APIs, and add new configuration parameters to Mastodon API
...
This patch:
- Fixes `rights` in twitterapi ignoring `show_role`
- Fixes exposing default scope of the user to anyone in Mastodon API
- Extends Mastodon API to be able to show and set `no_rich_text`, `default_scope`, `hide_follows`, `hide_followers`, `hide_favorites` (requested by the FE in #674 )
Sorry in advance for 500 line one commit diff, I should have split it up to separate MRs
5 years ago
963d5774af
fix the status notification with special char
5 years ago
030a7876b4
Merge branch 'security/fix-html-class-scrubbing' into 'develop'
...
html: lock down allowed class attributes to only those related to microformats
See merge request pleroma/pleroma!1090
5 years ago
f5535e5743
html: lock down allowed class attributes to only those related to microformats
5 years ago
9dd36e5bcb
Extend Mastodon API with public endpoint for getting Favorites timeline of any user ( #789 )
5 years ago
10c40e13d2
Merge branch 'mastoapi/add-in-reply-to-screen-name' into 'develop'
...
Add `in_reply_to_account_acct` to MastoAPI status entity
See merge request pleroma/pleroma!1086
5 years ago
aa9d378985
Merge branch 'fix/normalize-activities' into 'develop'
...
Normalize acitvities instead of objects inside them
See merge request pleroma/pleroma!1085
5 years ago
d35246c449
added healthcheck setting to instance config
5 years ago
f60d072bbb
Add `pleroma.in_reply_to_account_acct` to MastoAPI status entity
5 years ago
d21d921def
Replace Object.normalize(activity.data[object] with Object.normalize(acitivty) to benefit from preloading
5 years ago
b9cdf6d3b9
Use `User.get_cached*` everywhere
5 years ago
88f0be9693
Feature/826 healthcheck endpoint
5 years ago
e8c2f9a73a
Merge remote-tracking branch 'pleroma/develop' into feature/disable-account
5 years ago
7fcbda702e
Merge branch 'rework-emoji-management' into 'develop'
...
Remove finmoji and add a way to download emojis in packs
Closes #817 and #821
See merge request pleroma/pleroma!1073
5 years ago
3cefdc62e0
Fix emoji.txt / custom_emoji.txt / shortcode_globs handling
5 years ago
ba19ba8a88
Formatting
5 years ago
4908e0eeee
Fix Credo warning
5 years ago
eeb093631c
Fix Credo warning
5 years ago
e56afefef9
Refactor conversation function in MastodonAPIController to use a View
5 years ago
2662bea4e0
Add accounts and last_status to conversation read response
5 years ago
f1d90ee942
Remove debug code
5 years ago
2359ee38b3
Set digest emails to false by default
5 years ago
9256d2d4b4
[ #923 ] Refactored OAuthController#authorize definitions, added test.
5 years ago
375fd21055
Set correct values in the MastoAPI reblog status view
5 years ago
24073f829f
Refactor query to return only 1 message instead of 20
6 years ago
724311e151
Fix Credo warnings
6 years ago
60f213bb1a
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/digest-email
6 years ago
64a2c6a041
Digest emails
6 years ago
8f93d4c423
Remove most finmoji mentions where appropriate
6 years ago
53a3e61016
Fix priv/static/instance/static to be just instance/static
...
It was a misunderstanding
6 years ago
52ed287e87
Fix incorrect multiple emoji tag handling introduced in initial impl
6 years ago
aaaa428512
mix format
6 years ago
a141f0807b
Assume packs without emoji.txt only have emoji pictures, unhardcode
...
unhardcode: remove hardcoded /instance/static and actually use the config option
as it is used in other places.
packs without emoji.txt: these are now assumed to have .png files that
are all emojis, their names are used as shortcodes
6 years ago
1e44b5478d
Remove useless comment
6 years ago
c26724cc55
Remove finmoji and add a way to download emojis in packs
...
These packs are stored in a git repo on pleroma gitlab
6 years ago
fa48532387
Handle `reblogs` on the first follow request in MastoAPI
6 years ago
9da8b287f8
Merge branch 'feature/database-compaction' into 'develop'
...
database compaction
See merge request pleroma/pleroma!473
6 years ago
73407f4eea
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/digest-email
6 years ago
bc7862106d
Fix tests
6 years ago
8add119444
Add User.list_inactive_users_query/1
6 years ago
aeafa0b2ef
Add Notification.for_user_since/2
6 years ago
ada384207b
typo fix
...
docs for RelMe provider
6 years ago
218d96a26b
Merge branch '923_oauth_consumer_refactoring_ci' into 'develop'
...
OAuth consumer params handling refactoring
See merge request pleroma/pleroma!1047
6 years ago
f9865cf943
Stream out deletes, mistakingly removed when resolving merge conflicts
6 years ago
9238dccac1
Add a guard to fetching reply activity
6 years ago
eba3db0966
Merge branch 'bugfix/filter-boosted-blocks' into 'develop'
...
activitypub: fix filtering of boosts from blocked users
See merge request pleroma/pleroma!1074
6 years ago
1aa4994f6d
Do not require authentication for user search in MastoAPI
6 years ago
83589ca6a5
Merge branch 'develop' into feature/database-compaction
6 years ago
ac04311b3f
Fix search in TwitterAPI
6 years ago
6069d0fd36
Fix object search depending on embeded object
6 years ago
e31a22043b
Fix media timeline depending on embeded object and add some guards
6 years ago
2abc09570f
Use the preloaded object in tag queries
6 years ago
36f78c6dcd
activitypub: fix filtering of boosts from blocked users
6 years ago
2140e164d7
activitypub: properly filter out transitive activities concerning blocked users
6 years ago
35ac672b8d
Remove containment tests from transmogrifier and fix thread visibility solver
6 years ago
4c289e924e
Fix delete-by_ap_id to expect not only embeded objects
6 years ago
8e4d950f31
Remove updating reply count for embeded objects
6 years ago
c3a2052806
If it's an object struct it is already normalized
6 years ago
a53b917e7f
oof
6 years ago
ad681877df
Make credo happy
6 years ago
e641651e2b
Fix unbookmarking
6 years ago
e7c3c36766
Update functions in object fetcher for tesla and set up a proper mock for tests
6 years ago
b09ae02c04
Added some more normalization calls all in mastodon api controller
6 years ago
2f0203a4a1
Resolve conflicts
6 years ago
87013f8438
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/digest-email
6 years ago
462028688b
Fix pinned posts relying on embded objects
6 years ago
627e5a0a49
Merge branch 'develop' into feature/database-compaction
6 years ago
128aae05f3
[ #923 ] Minor semantic adjustment.
6 years ago
73df3046e0
Merge branch 'feature/788-separate-email-addresses' into 'develop'
...
Feature/788 separate email addresses
Closes #788
See merge request pleroma/pleroma!1040
6 years ago
02a53d00c9
Merge branch 'fix/remote-follow-auth' into 'develop'
...
Fix: remote follows should not ask user to log-in again for authorization
See merge request pleroma/pleroma!1060
6 years ago
cde7711b12
Merge branch 'bugfix/relax-spam-protection' into 'develop'
...
activitypub: allow indirect messages from users being followed at a personal inbox
See merge request pleroma/pleroma!1069
6 years ago
d4a749cfb2
Handle new-style mastodon follow lists
...
Fixes https://git.pleroma.social/pleroma/pleroma/issues/814
6 years ago
750b369d04
activitypub: allow indirect messages from users being followed at a personal inbox
6 years ago
6e26ac10a3
make Pleroma.Endpoint use extra_cookie_attrs in config
6 years ago
76999c73a7
Conversation: Add accounts to output.
6 years ago
0da985182f
Conversation: Return full status object, id is a string.
6 years ago
c1ebb38d3a
Conversation: Also create participations for remote users.
...
Needed to get the participating user list.
6 years ago
56956de6fa
Merge branch 'fix/status-reblogged' into 'develop'
...
Assign reblogged in the Mastodon reblog status view
Closes #812
See merge request pleroma/pleroma!1057
6 years ago
f358295cbe
Merge branch 'unfollow-oneself' into 'develop'
...
Consistent response for self follow/unfollow
Closes #819
See merge request pleroma/pleroma!1061
6 years ago
27d78dc526
Use User.get_cached_by*
6 years ago
5d73dca064
Remove inReplyToStatusId
6 years ago
507e7821e3
Handle follow/unfollow directed to themselves
6 years ago
dc21181f65
Update updated_at field on notification read
6 years ago
e513504e88
Revert "Assert on the success of enqueue before returning"
...
This reverts commit 16d8c8b33b
6 years ago
16d8c8b33b
Assert on the success of enqueue before returning
6 years ago
5e45557751
Always return {atom, _} from try_send_confirmation
6 years ago
ec42b639a3
fix pattern match on user registration
...
deliver_async will return a single atom
6 years ago
679a8ef629
Assign reblogged in the Mastodon reblog status view
6 years ago
0cd4b6024d
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/digest-email
6 years ago
371a4aed2c
Add User.Info.email_notifications
6 years ago
c349573791
Merge develop to 788-separate-email-addresses
...
Merge conflicts:
test/web/twitter_api/twitter_api_test.exs
test/web/twitter_api/twitter_api_controller_test.exs
test/web/admin_api/admin_api_controller_test.exs
6 years ago
a64eb2b389
fallback to the old behaviour
...
admin and user mailers
6 years ago
f9af90c5aa
Revert "simplify mentions escape"
...
This reverts commit f3e06a1030636f24f7129dd93bb9780e67fb7de1.
6 years ago
184ae60b21
Merge branch 'bugfix/pleroma-email-naming' into 'develop'
...
Make the filename and module name of Pleroma.Emails.* orthogonal
See merge request pleroma/pleroma!1029
6 years ago
dd097a406b
add tests
6 years ago
0a09692c7d
Merge branch 'features/mastoapi/2.6.0-min_id-pagination' into 'develop'
...
Features: mastoapi-2.6.0 `min_id` pagination
Closes #351
See merge request pleroma/pleroma!976
6 years ago
57d5ff57d6
Merge branch 'fix/732-password-align' into 'develop'
...
password reset page labels align
See merge request pleroma/pleroma!986
6 years ago
711ade961e
adding destroy multiple for mastofe
6 years ago
e03d24af96
in_reply_to_id - null
6 years ago
31c06dba5a
Merge branch 'fix/hackney_max_body_param' into 'develop'
...
Add `with_body: true` to requests relying on `max_body: val`
Closes #778
See merge request pleroma/pleroma!1049
6 years ago
4615e56219
Add `with_body: true` to requests relying on `max_body: val`
6 years ago
d6d5f46bae
Update OAuth web template
6 years ago
46bd5c1d87
fix format
6 years ago
db4badc6aa
move user disable into deactivation
6 years ago
0f2f7d2cec
Merge remote-tracking branch 'pleroma/develop' into feature/disable-account
6 years ago
c3f12cf3c3
[ #923 ] OAuth consumer params handling refactoring.
...
Registration and authorization-related params are wrapped in "authorization" in order to reduce edge cases number and simplify handling logic.
6 years ago
d115d2a27e
Conversations: Tidying up.
6 years ago
c352a0aba6
Conversations: Make tests run.
6 years ago
280172f6f6
Conversations: Create or bump on inserting a dm.
6 years ago
fe511a6c65
Merge branch 'develop' into feature/788-separate-email-addresses
6 years ago
fe13a1d78c
adding notify_email setting for trigger emails
6 years ago
e5d553aa45
Merge branch 'feature/767-multiple-use-invite-token' into 'develop'
...
Feature/767 multiple use invite token
See merge request pleroma/pleroma!1032
6 years ago
be8350baa2
Merge branch 'develop' into feature/user-status-subscriptions
6 years ago
c8440b5e0c
Merge branch 'fix/emoji-api-nonsense' into 'develop'
...
Change response format of /api/pleroma/emoji so it makes sense
See merge request pleroma/pleroma!1038
6 years ago
9c1b36856b
s/Pleroma.UserEmail/Pleroma.Emails.UserEmail/
6 years ago
cae0231731
s/Pleroma.AdminEmail/Pleroma.Emails.AdminEmail/
6 years ago
1791ee8ec4
s/Pleroma.Mailer/Pleroma.Emails.Mailer/
6 years ago
0ab563d334
Merge branch 'hotfix/fix_undefined_summary' into 'develop'
...
transmogrifier.ex: Add fix_summary/1
See merge request pleroma/pleroma!1039
6 years ago
97395e013e
Merge branch 'notification-pleroma-settings' into 'develop'
...
Notification controls
Closes #738
See merge request pleroma/pleroma!988
6 years ago
cf9ba8fe1b
transmogrifier.ex: Add fix_summary/1
...
MRF.KeywordPolicy assumes that summary is present in a activity,
and this would probably simplify code elsewhere too anyway.
6 years ago
b57b43027c
Change response format of /api/pleroma/emoji to the one that actually makes sense
6 years ago
144648de92
Merge branch 'mastoapi/plaintext-statuses' into 'develop'
...
Provide plaintext representations of content/cw in MastoAPI
Closes #787
See merge request pleroma/pleroma!1035
6 years ago
0a02ed7a2f
Merge branch 'bugfix/follower_count' into 'develop'
...
update the follower count when a follower is blocked
See merge request pleroma/pleroma!1033
6 years ago
07afb9b537
update the follower count when a follower is blocked
6 years ago
589629cf3e
Used cached user resources in subscriptions
6 years ago
fee50636d0
removing not needed invite update
6 years ago
d0696fdfd6
fix for elixir 1.7.4
6 years ago
a9f805c871
Merge remote-tracking branch 'origin/develop' into features/mastoapi/2.6.0-conversations
6 years ago
87a01f9ee0
Use Pleroma.Config instead of Application.get_env
6 years ago
9abf832b03
Merge remote-tracking branch 'pleroma/develop' into use-jobs-in-webpush
6 years ago
13ff312c48
Sever subscription in case of block
6 years ago
e19590c93f
Merge branch 'improve_upgrade_user_from_ap_id' into 'develop'
...
Improve Transmogrifier.upgrade_user_from_ap_id/2
See merge request pleroma/pleroma!1019
6 years ago
fd45cab9ec
Merge branch 'twitter_oauth' into 'develop'
...
OAuth consumer (sign in / sign up with external provider)
See merge request pleroma/pleroma!923
6 years ago
36c0a10fdf
adding language tag
6 years ago
23067908de
Merge branch 'feature/770-add-emoji-tags' into 'develop'
...
Feature/770 add emoji tags
See merge request pleroma/pleroma!998
6 years ago
c3d5c3513a
Merge remote-tracking branch 'pleroma/develop' into use-jobs-in-webpush
6 years ago
a1a854646e
Merge branch 'develop' into use-jobs-in-webpush
6 years ago
bffddf5e31
[ #923 ] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
...
# Conflicts:
# docs/config.md
# test/support/factory.ex
6 years ago
b4da2bc1d0
Merge branch 'develop' into 'improve_upgrade_user_from_ap_id'
...
# Conflicts:
# config/config.exs
# docs/config.md
6 years ago
b177e1e7f3
Merge branch 'scheduled-activities' into 'develop'
...
Scheduled activities
See merge request pleroma/pleroma!989
6 years ago
012bb5dcc9
renaming expire_at -> expires_at
...
keyword style change
6 years ago
76fdfd1c7f
Add check on activity visibility in sub notification
6 years ago
56c75aec12
credo fix
6 years ago
b810aac117
added docs to docs/api/admin_api.md
...
code style and little renamings
6 years ago
e3328bc138
[ #923 ] Removed <br> elements from auth forms, adjusted docs, minor auth settings refactoring.
6 years ago
fb2040d061
Merge branch 'fix/deactivated-user-error' into 'develop'
...
Return 403 for deactivated user on token request
Closes #785
See merge request pleroma/pleroma!1031
6 years ago
2056efa714
Add scheduler for sending scheduled activities to the queue
6 years ago
fc92a0fd8d
Added limits and media attachments for scheduled activities.
6 years ago
b3870df51f
Handle `scheduled_at` on status creation.
6 years ago
7bf622ce73
Add scheduled activities
6 years ago
7aa53d52bd
Return 403 on oauth token exchange for a deactivated user
6 years ago
ce8d457132
little channges
6 years ago
c05fe4da0a
Document subscription endpoints, fix typos
...
Also adds a quick error case on the subscription endpoints
to avoid 500s
6 years ago
9aeac7dcca
Merge branch 'feature/prometheus' into 'develop'
...
Upstream: Metrics and debugging
See merge request pleroma/pleroma!1020
6 years ago
a53d591ac5
code style
6 years ago
7410aee886
Merge develop to 770-add-emoji-tags
...
Merge conflict in test/web/mastodon_api/mastodon_api_controller_test.exs
6 years ago
dcc54f8cfa
admin api endpoints for invites
6 years ago
47b07cec49
token -> invite renaming
6 years ago
be54e40890
twitter api registration
...
fix for twitter api tests
6 years ago
0484f3a8b1
generating tokens with mix
6 years ago
325a268017
Redirect to the referer url after mastofe authorization
6 years ago
b5a2d384f7
Redundant Repo.get_by usage was recently removed from the codebase
6 years ago
7895ee37fa
Add user following / unfollowing to the admin api.
6 years ago
9ca91cbb87
Change relationship direction of subscriptions
6 years ago
d35f6551c1
Move subscriptions endpoint to be under /pleroma
6 years ago
d56866c824
Add subscribed status to user view
...
Added in pleroma extensions, but can be moved whenever
6 years ago
316fe20d86
Make subscriptions the same direction as blocks
...
That being, user - subscribes to -> users, rather than
user - has subscribers -> users
6 years ago
23c4f49494
Fix subscription endpoint return formats
6 years ago
007762e767
Add notification checks
6 years ago
79910ce5cc
Add API endpoints and user column for subscription
6 years ago
1c2e4f88d1
fix credo
6 years ago
f1712cd2f1
Use PleromaJobQueue in Pleroma.Web.Push
6 years ago
f0f30019e1
Refactor html caching functions to have a key instead of a module, use more correct terminology and fix summaries in mastoapi
6 years ago
47a236f753
[ #923 ] OAuth consumer mode refactoring, new tests, tests adjustments, readme.
6 years ago
3e7f2bfc2f
[ #923 ] OAuthController#callback adjustments (with tests).
6 years ago
45765918c3
[ #923 ] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
...
# Conflicts:
# mix.exs
6 years ago
f7cd9131d4
[ #923 ] OAuth consumer controller tests. Misc. improvements.
6 years ago
69038887b2
Code readability tweak
6 years ago
0b5c818cb7
[ #1 ] fix telemetry
6 years ago
bc3618a38d
Set up telemetry and prometheus
6 years ago
cfa6e7289f
Improve Transmogrifier.upgrade_user_from_ap_id/2
6 years ago
af0065a71f
mastodon_api_controller.ex: Add pleroma-tan to initial_state
6 years ago
79cb34a4b0
Fix preview not being usable in form data
6 years ago
0cb94cfa94
Merge branch 'fix-slow-relationships' into 'develop'
...
ActivityPub Utils: Greatly speed up the follow / block activity fetching.
See merge request pleroma/pleroma!1011
6 years ago
256b492a58
Merge branch 'bugfix/wrong-date-format' into 'develop'
...
Support activities with dates in the Unix timestamp format
Closes #763
See merge request pleroma/pleroma!1004
6 years ago
a79ce94dd4
Merge branch 'feature/fake-statuses' into 'develop'
...
Add fake status submit
See merge request pleroma/pleroma!995
6 years ago
39bcf93007
Merge remote-tracking branch 'origin/develop' into fix-slow-relationships
6 years ago
fd07745d1b
ActivityPub Utils: Greatly speed up the follow / block activity fetching.
6 years ago
fa8483cb80
Merging develop into feature/770-add-emoji-tags
...
Conflict test/web/twitter_api/util_controller_test.exs
6 years ago
d140738edf
second level of headertext change in doc
6 years ago
180b87257c
Merge branch 'bugfix/share-mastodon' into 'develop'
...
[OStatus] adds status to pleroma instance if the url given is a status
See merge request pleroma/pleroma!1002
6 years ago
ce9284b36f
Merge branch 'remove-user-activities' into 'develop'
...
[#757 ] Add mix task to delete user's activities
See merge request pleroma/pleroma!1008
6 years ago
b95cf3d490
Merge branch 'get_by_id' into 'develop'
...
Replace `Repo.get_by` with existing functions
See merge request pleroma/pleroma!1010
6 years ago
9e0567ec52
Merge develop into feature/770-add-emoji-tags
6 years ago
fdb4357e9b
Rename fake param to preview and make the tests check that the object was not inserted to the db
6 years ago
37925cbe78
Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
...
# Conflicts:
# lib/pleroma/web/oauth/oauth_controller.ex
# lib/pleroma/web/router.ex
6 years ago
091baf9316
Merge branch 'features/mastoapi/2.6.0-force-login-option' into 'develop'
...
MastoAPI 2.6.0 `force_login` option
Closes #734
See merge request pleroma/pleroma!999
6 years ago
26d509cc86
Merge branch 'get_by_id' into 'develop'
...
Replace `Repo.get(Module, id)` with `Module.get_by_id(id)` where possible
See merge request pleroma/pleroma!1009
6 years ago
95c92c49c9
Fix account lookup for nicknames beginning with numbers
6 years ago
590c935d95
[ #923 ] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
...
# Conflicts:
# mix.exs
6 years ago
88d3cb44c3
replace `Repo.get_by(User, nickname: nickname)` with `User.get_by_nickname(nickname)`
6 years ago
1b3d921921
change `Repo.get(User, id)` => `User.get_by_id(id)`
6 years ago
4212527928
change `Repo.get(Activity, id)` => `Activity.get_by_id(id)`
6 years ago
3db9235150
Ignore dates in wrong formats
6 years ago
a14742f495
add `user delete_activities` mix task
6 years ago
08d64b977f
little changes and typos
6 years ago
9b2188da7c
refactoring of emoji tags config to use groups
6 years ago
a1869f5272
Merge remote-tracking branch 'pleroma/develop' into remove-user-activities
6 years ago
f20e8d28de
add support for all status type (ostatus) and replase case with if
6 years ago
aac48d0cc6
Merge remote-tracking branch 'remotes/upstream/develop' into features/mastoapi/2.6.0-conversations
6 years ago
6386c1c9c1
fetch url for OStatus to know if it is a/c or status
6 years ago
f56eef8d8c
router: Add fake identity proof endpoint
6 years ago
b6f9f7b8aa
Handle dates in the Unix timestamp format ( Fixes #763 )
6 years ago
1d01e8e656
[OStatus] adds status to pleroma instance if the url given is a status
6 years ago
6910fb371b
Fixed local MastoFE authentication / `force_login` option.
6 years ago
cbe09d94d1
Added `force_login` authentication option (previously applied by default).
6 years ago
17d3d05a71
code style
...
little fix
6 years ago
3601f03147
Adding tag to emoji ets table
...
changes in apis
6 years ago
fe5145eeaa
Move putting fake attribute to lib/pleroma/web/activity_pub/utils.ex
6 years ago
975482f091
insert object defaults for fake activities and make credo happy
6 years ago
d866b59eea
oof
6 years ago
45ba10bf47
Fix the issue with HTML scrubber
6 years ago
804173fc92
[ #923 ] Minor code readability fix.
6 years ago
eadafc88b8
[ #923 ] Deps config adjustment (no `override` for `httpoison`), code analysis issues fixes.
6 years ago
baffdcc480
[ #923 ] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
...
# Conflicts:
# mix.exs
6 years ago
629ad1766c
BBS: Some fixes.
6 years ago
e3bf6655ba
Add replying.
6 years ago
10fdc080a0
BBS: Tests and formatting.
6 years ago
17ab9fa45b
BBS: Some more functionality.
6 years ago
c810fb81a4
Basic SSH daemon.
6 years ago
cd387f8693
Add a fake option to lazy_put_actvity_defaults
6 years ago
1bb4d5d65b
Implement fake status submit
6 years ago
9a39d1d846
Replace Pleroma.Jobs with `pleroma_job_queue`
6 years ago
c8abef373b
mastodon_api_controller.ex: fallback to first for min_id
6 years ago
6b407872b4
mastodon_api_controller.ex: Use min_id in link header instead of since_id
6 years ago
e83ad12c57
pagination.ex: Drop atom keys in params
...
Atom keys could also have been transformed to string, or the other
way around but this one is more efficient and what we actually
expect with the current param_types in Pagination
6 years ago
6f15224053
activity_pub.ex: Move limit/max_id restrictions to Pagination helpers
6 years ago
cd90695a34
Add PUT /api/pleroma/notification_settings endpoint
6 years ago
55d086b520
Notification controls
...
Allow users to configure whether they want to receive notifications from people they follow / who follow them, people from remote / local instances
6 years ago
10c81fc902
Add user show endpoint for Pleroma admin API
6 years ago
3ca6c4f443
password reset page labels align
6 years ago
20e0f36605
Merge remote-tracking branch 'remotes/origin/develop' into twitter_oauth
6 years ago
2a95014b9d
[ #923 ] OAuth consumer improvements, fixes, refactoring.
6 years ago
926bf114b7
Merge branch 'feature/more-user-filters' into 'develop'
...
Add more user filters + move search to its own module
See merge request pleroma/pleroma!982
6 years ago
ce6d64bbd8
Fix missing announces in MastoAPI home timeline
...
Closes #762
6 years ago
3cf7539bca
Add more user filters + move search to its own module
6 years ago
a4ab60ac54
Add vapid_key to the `POST /api/v1/apps` response
6 years ago
691d1208b5
Add GET /api/v1/apps/verify_credentials
6 years ago
ff3b09f6b3
Merge branch 'fix/ap-icon' into 'develop'
...
Do not federate instance avatar
Closes #759
See merge request pleroma/pleroma!977
6 years ago
c6ab5ebe7c
Merge branch 'features/mastoapi/2.7.2-instance-attributes' into 'develop'
...
Mastodon 2.7.2 instance attributes (registrations, languages)
See merge request pleroma/pleroma!979
6 years ago
10a7a4a868
AP UserView: Refactor banner / avatar display code, add test.
6 years ago
9e3899bf36
Merge branch 'features/mastoapi/2.7.0-auth-error-messages' into 'develop'
...
Mastodon-based auth error messages. User#auth_active?/1 refactoring.
See merge request pleroma/pleroma!978
6 years ago
21ff78cd40
Merge branch 'replies-count' into 'develop'
...
Increment replies_count (MastoAPI)
Closes #756
See merge request pleroma/pleroma!974
6 years ago
406d19331f
Remove ActivityRepresenter
6 years ago
eef1042b16
Mastodon 2.7.2 instance attributes (registrations, languages).
6 years ago
568e348588
Increment replies_count on replies (MastoAPI)
6 years ago
b0759f821b
Comments split.
6 years ago
263ca3dea2
Mastodon-based auth error messages. Defaulted User#auth_active?/1 to `true`.
6 years ago
c410296120
Try sending an empty map
6 years ago
6f090f981b
Attempt to fix incorrect federation of default instance avatars
6 years ago
b028b0f97d
Merge branch 'bugfix/missing-announces' into 'develop'
...
fix up missing announcements with preloads
See merge request pleroma/pleroma!972
6 years ago
26b0c802c3
fix up missing announcements with preloads
6 years ago
bc14c98de1
Merge branch 'features/s3-uploader-digital-ocean' into 'develop'
...
add overriding truncated_namespace condition for truncating paths for digital ocean
See merge request pleroma/pleroma!969
6 years ago
63ffa4842c
Merge branch 'fix/mastoapi-liked' into 'develop'
...
Serve non-public activities in /api/v1/favourites
Closes #648
See merge request pleroma/pleroma!970
6 years ago
a7f58b3c13
Serve non-public activities in /api/v1/favourites
...
Fixes #648
6 years ago
6c96d68f77
add overriding truncated_namespace condition for truncating paths for digital ocean
6 years ago
750de7d842
Merge branch 'features/mrf-keyword-nil-summary' into 'develop'
...
mrf/keyword_policy.ex: Fix when summary == nil, do not whitelist content == nil
See merge request pleroma/pleroma!968
6 years ago
eab9425cc4
mrf/keyword_policy.ex: Fix when summary == nil, do not whitelist content == nil
6 years ago
4aa699271c
activity: use left join instead of inner join when fetching activities that may or may not have a child object
6 years ago
332dc1371b
user: use preloads when deleting accounts
6 years ago
debf7f016d
ostatus: use preload objects with Object.normalize() when opportunistic
6 years ago
3c2350cbee
object: downgrade normalize warning to debug severity
6 years ago
8c70156157
activitypub: object view: use preloaded object when possible
6 years ago
f9d5c13b21
activity: add get_by_ap_id_with_object()
6 years ago
ce47eb8b29
activitypub: when fetching objects, use the preloaded object from the synthesized activity
6 years ago
aabcecb269
notification: formatting
6 years ago
07cdd9ed02
streamer: use the preloaded object if possible
6 years ago
c62220c500
rich media: helpers: only crawl Create activities
6 years ago
9a06d9f6e8
notification: preload child objects
6 years ago
4cedf45423
relay: use preloaded object since we always have it
6 years ago
e430a71d37
ostatus: fetch preloaded object in note handler for testsuite
6 years ago
73efe95368
activitypub: allow skipping preload in some cases (like certain tests where the preload is obnoxious)
6 years ago
ba7299fc87
activitypub: add missing with_preloaded_object()
6 years ago
e4307cadc8
activitypub: splice in the child object if we have one
6 years ago
a6973a668e
formatting
6 years ago
59518cbcd8
activity: fix credo nitpick
6 years ago
b3bf523c09
rich media: use optimized Object.normalize()
6 years ago
e75e43b949
common api: use the optimized Object.normalize whenever possible
6 years ago
9aea7cc224
activitypub: preload child objects when fetching timelines
6 years ago
092cedede5
activity: add with_preloaded_object() convenience
6 years ago
62bccddde0
object: add support for preloading objects when walking an activity graph in normal form
6 years ago
1b33986bfa
Fix text being nullable in TwitterAPI
6 years ago
fee360e581
Merge branch 'safe-mentions' into 'develop'
...
NodeInfo: Return safe_dm_mentions feature flag.
See merge request pleroma/pleroma!964
6 years ago
e2afce34b6
NodeInfo: Return safe_dm_mentions feature flag.
6 years ago
3229c7a1d6
Ensure fts is prefered over trigram and use union_all instead of union in user search query
6 years ago
27e03a2177
reports: fix up email generation for remote reports
6 years ago
1c3d3d0c2b
Merge branch 'safe-mentions' into 'develop'
...
Add safe dm mode option.
See merge request pleroma/pleroma!958
6 years ago
3cc2554fa3
mastodon api: add conversation_id extension (ref #674 )
6 years ago
fea3696799
common api: move context functions from twitterapi
6 years ago
bf8b29e080
Merge branch 'feature/move-search-to-db' into 'develop'
...
Move gluing search results from application to database and get mutuals a higher score multiplier
See merge request pleroma/pleroma!960
6 years ago
88096c65a5
Move gluing search results from application to database and get mutuals
...
a higher score multiplier
6 years ago
80bc9ed2ba
Add a gopher url port config option
...
This lets the user advertise a different port in the gopher urls,
for example listening locally on port 7070 but telling clients to
connect to the regular port 70.
6 years ago
b92a16aa00
Merge branch 'ecto-3-migration' into 'develop'
...
Ecto 3.0.7 (ecto_sql 3.0.5) migration
See merge request pleroma/pleroma!957
6 years ago
bf27190f7f
UtilController: Return state of safe dm mentions.
6 years ago
8468f3f6d4
Add safe dm mode option.
6 years ago
af68a42ef7
[ #923 ] Support for multiple OAuth consumer strategies.
6 years ago
19a19bdd81
Fix migration timestamp type
6 years ago
9a7b817c9a
Ecto 3.0.5 migration
...
kms
6 years ago
e17a9a1f66
[ #923 ] Nickname & email selection for external registrations, option to connect to existing account.
6 years ago
7ac9fff437
Format
6 years ago
ed8a2935f5
Use ILIKE to search users
6 years ago
1685e4258f
transmogrifier: upgrade: when upgrading OStatus users to AP, ensure we always use the fake collection
6 years ago
67ff8d9311
user: properly cope with actors which do not declare a followers collection
6 years ago
cd055983c3
transmogrifier: when determining followers collection URI, we may need to fetch the actor
6 years ago
d487b753c3
activitypub: transmogrifier: do not allow missing lists to be interpreted as nil
6 years ago
798da28812
activitypub: transmogrifier: ensure as:Public activities are delivered to followers
6 years ago
43bd7f47db
Merge branch 'feature/order-users-by-nickname-admin-api' into 'develop'
...
Order users by nickname
See merge request pleroma/pleroma!945
6 years ago
aba4c27120
Merge branch 'masto-api-notifications' into 'develop'
...
Add support for exclude_types, limit and min_id in Mastodon notifications
See merge request pleroma/pleroma!949
6 years ago
40e9a04c31
[ #923 ] Registration validations & unique index on [:user_id, :provider].
6 years ago
a1aacc08a4
Check if the user has indeed not been federated with
...
Just updating the user triggered post fetching too, now it
shouldn't. It only happened in the AP user fetching since that's
what's used to update users
6 years ago
8d21859717
[ #923 ] External User registration refactoring, password randomization.
6 years ago
97b35e00b0
Fix with expression always matching
6 years ago
e572786dad
Run
6 years ago
af4338da0c
Use better error message
6 years ago
26b6354095
[ #923 ] Support for multiple (external) registrations per user via Registration.
6 years ago
5ba14c664b
Fix missing end brace
6 years ago
a2e03d4f3c
Initial attempt at updating return type
6 years ago
1588688a11
Added support for exclude_types, limit, and min_id in Mastodon
...
notifications.
Unify Mastodon-compatible pagination logic.
6 years ago
2a96283efb
[ #923 ] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
...
# Conflicts:
# config/config.exs
# lib/pleroma/web/auth/pleroma_authenticator.ex
6 years ago
f6fab01ba7
Web.Router: Add routes for Conversation mastoAPI
6 years ago
4ed2618f6c
Allow 'rel' attribute on `<a>` link with specific values (for hashtag recognition).
6 years ago
93291c3d7a
Order users by nickname
6 years ago
6d6f48d079
Merge branch 'feature/federated-flags' into 'develop'
...
Federated reports
See merge request pleroma/pleroma!935
6 years ago
28df397454
Merge branch 'feature/oauth-me' into 'develop'
...
oauth: add me property to token responses
See merge request pleroma/pleroma!942
6 years ago
c69dc2acf1
Merge branch 'feature/reblog-muting' into 'develop'
...
Implement mastodon's reblog hiding feature
See merge request pleroma/pleroma!916
6 years ago
e0edc706cf
oauth: add me property to token responses
6 years ago
43fb03be5a
Allow to mark a single notification as read
6 years ago
4b3c86c1a6
Merge branch 'fix/mediaproxy-capture-content-disposition-filename' into 'develop'
...
MediaProxy: parse filename from content-disposition for non-whitelisted types
See merge request pleroma/pleroma!936
6 years ago
8b352af4dd
Merge branch 'feature/openldap-support' into 'develop'
...
OpenLDAP support
Closes #203
See merge request pleroma/pleroma!859
6 years ago
2739057442
Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
6 years ago
aacbf0f570
[ #923 ] OAuth: prototype of sign in / sign up with Twitter.
6 years ago
d8244c2a1b
remove unused function
6 years ago
dfeb3aec44
fix credo warning
6 years ago
094e1ef048
formatting
6 years ago
da53c079db
Refactor to store user ap_id, add tests
6 years ago
be465c762b
formatting
6 years ago
15b21d1983
refactor filtering mechanism
6 years ago
aa71139e4a
Fix elixir 1.8 vs 1.7 format conflict
6 years ago
fe4c1d26fc
Add ActivityPub.contain_activity checks to streamer
6 years ago
c8f31e0bc2
Implement mastodon's reblog hiding feature
6 years ago
41fc67aa49
Merge branch 'mastoapi/mime_type' into 'develop'
...
Extend MastoAPI to provide attachment mimetypes
See merge request pleroma/pleroma!938
6 years ago
d7a34b604b
Extend MastoAPI to provide attachment mimetypes
6 years ago
d02f1120f9
Content-Disposition regex improvements
6 years ago
0f42ea87d6
Merge branch 'notifications-is-seen' into 'develop'
...
MastoAPI notifications is_seen
See merge request pleroma/pleroma!934
6 years ago
c708656b5e
Merge branch 'robotstxt' into 'develop'
...
Add robots.txt
Closes #723
See merge request pleroma/pleroma!929
6 years ago
3dadaa4432
robots.txt
...
Add default robots.txt that allows bots access to all paths.
Add mix task to generate robots.txt taht allows bots access to no paths.
Document custom emojis, MRF and static_dir
static_dir documentation includes docs for the robots.txt Mix task.
6 years ago
958227d556
MediaProxy: parse filename from content-disposition for non-whitelisted types
6 years ago
100413bf2c
Add `is_seen` to MastoAPI notifications, extract rendering logic into separate NotificationView, add tests
6 years ago
423fd07928
activitypub: inject to/cc fields on non-forwarded reports since Flag activities are now Forwardable
6 years ago
5c7b774f09
reports: unify sending e-mail for both remote and local reports
6 years ago
64b0120d67
activitypub: add support for forwarding reports
6 years ago
cbdd11c381
Merge develop to bump elixir version in the CI so I don't get failing formatting
6 years ago
3b48d5f0c2
common api: add support for forwarding reports
6 years ago
379442ad17
activitypub: utils: also match Activity objects
6 years ago
0f3ecb2bfb
activitypub: transmogrifier: accept remote Flag activities
6 years ago
f86f7dbb8f
activitypub: utils: rework make_flag_data to accept either activity payloads or IRIs
6 years ago
e2fe796c63
Add some tests
6 years ago
34fc0dca2e
Merge branch 'hotfix/delete-activities' into 'develop'
...
Fix delete activities not federating
See merge request pleroma/pleroma!933
6 years ago
e630e5e135
Fix delete activities not federating
6 years ago
54e7087ab4
Merge remote-tracking branch 'upstream/develop' into feature/openldap-support
6 years ago
59333f2d56
Merge branch 'admin-api-account-view-namespace' into 'develop'
...
MastodonAPI.Admin.AccountView → AdminAPI.AccountView
See merge request pleroma/pleroma!930
6 years ago
86871c8a04
Merge branch 'feature/add-local-to-users-admin-api' into 'develop'
...
Add "local" & "tags" to users admin API
See merge request pleroma/pleroma!932
6 years ago
f3964f4024
Ensure empty array is returned for tags
6 years ago
257d8e78e5
Add tags
6 years ago
4e72762322
Merge branch 'mastofe-content-types' into 'develop'
...
Set content types settings on mastofe endpoint.
See merge request pleroma/pleroma!894
6 years ago
e416c344dd
Unify unfollow, accept and reject follow requests using CommonAPI
6 years ago
490d9cf7b1
Add "local" to users admin API
6 years ago
cc0f2f8ba3
MastodonAPI.Admin.AccountView → AdminAPI.AccountView
6 years ago
d43b1c0b5d
Pleroma.Web.TwitterAPI.Controller: Remove duplicated alias/es
6 years ago
4b73ca638e
[Credo][CI] Add readability as it’s fixed
6 years ago
23960309a0
[Credo] Change quoted string with 3+ quotes to sigils
6 years ago
c42d34b2ec
[Credo] fix Credo.Check.Readability.MaxLineLength
6 years ago
8cd3eada7d
[Credo] write large numbers with underscore separation
6 years ago
c3d41b2b6e
[Credo] make all variables use snake_case
6 years ago
fb82f6fc7c
[Credo] Remove parentesis on argument-less functions
6 years ago
a3a9cec483
[Credo] fix Credo.Check.Readability.AliasOrder
6 years ago
4c440f12c3
[Credo] Fix the consistency
6 years ago
6c8743d0c0
[Credo] Fix the warnings
6 years ago
25eb6cf1cb
Add "roles" to users admin API
6 years ago
c231ed610a
Merge branch 'masto-api-followers-following' into 'develop'
...
MastoAPI followers/following endpoints
See merge request pleroma/pleroma!924
6 years ago
9338f061a3
Support LDAP method start_tls
6 years ago
d013b58e84
add `mix pleroma.user delete_activities NICKNAME` task
6 years ago
984b5f8adf
MastoAPI followers/following endpoints
6 years ago
92a69bddce
escape quotation marks in Content-Disposition header
6 years ago
5a73cae2be
WIP: Stop mangling filenames
6 years ago
4aa285e6ce
Merge branch 'add-screenname-extension-to-masto-api' into 'develop'
...
MastoAPI Accounts: Add fetching by nickname.
See merge request pleroma/pleroma!922
6 years ago
07277879e5
Linting.
6 years ago
600f428db4
WebPush: Add activity id to the push messages.
...
Makes it easier to relate the push to a given status.
6 years ago
63ab61ed3f
Sign in via Twitter (WIP).
6 years ago
3474066f6d
MastoAPI Accounts: Add fetching by nickname.
...
This is to make it easier for the frontends to handle domain.com/users/nickname
urls.
6 years ago
2c8deecdd2
Merge branch 'add-local-field-to-status' into 'develop'
...
MastoAPI StatusView: Add locality indicator.
See merge request pleroma/pleroma!920
6 years ago
d9ae2d00a1
Merge branch 'feat/style-oauth-login-page' into 'develop'
...
Style again the OAuth login page to fit pleroma more
See merge request pleroma/pleroma!921
6 years ago
50edead11c
Remove chromium input hilight that clashes with our own
6 years ago
8ddbedcd9a
Style again the login page to fit pleroma more
6 years ago
4811eefa6e
MastoAPI StatusView: Add locality indicator.
6 years ago
6038c8a753
Broadcast deleted activity id on deletion to conform to MastoAPI streamig spec
6 years ago
1f78d23eed
http: connection: unify adapter configuration and defaults
6 years ago
ba48bd901c
http: connection: relax the timeouts a little
6 years ago
19afd9f81f
http: rework connection timeouts to match hackney docs, enforce 1 second max TCP connection timeout
6 years ago
773f532b14
http: actually pass the options list to the Connection factory
6 years ago
50ba4ba2c9
http: connection: merge hackney option lists instead of concatenating them
...
this ensures the right pools are used
6 years ago
2a83c0ba93
http: safely catch erlang exits and elixir errors from hackney (ref #672 )
6 years ago
46200d8fac
Merge branch 'fix-tlsv1.3' into 'develop'
...
Fix supported TLS versions as TLS 1.3 support seems buggy.
Closes #708
See merge request pleroma/pleroma!892
6 years ago
735f40047a
Merge branch 'delete-status' into 'develop'
...
Allow an admin to delete a user status #721 (MastoAPI)
See merge request pleroma/pleroma!914
6 years ago
130fc9eae6
Merge branch 'fetch-posts-on-first-federation' into 'develop'
...
Fetch user's outbox posts on first federation with that user
Closes #131
See merge request pleroma/pleroma!907
6 years ago
2827dfea50
Allow an admin to delete a user status
6 years ago
5021b7836f
Fetch user's outbox posts on first federation with that user
6 years ago
e53a9fd15e
MRF: anti followbot: gracefully handle accounts without a display name
6 years ago
992145e64c
Merge branch 'bugfix/delete-activity-audience' into 'develop'
...
expand the audience of delete activities to all recipients of the deleted object
Closes #682
See merge request pleroma/pleroma!891
6 years ago
c2faae70df
Adjust delete activity audience to match the deleted object
6 years ago
6a69ece437
Revert existing object check
6 years ago
7342b5a45f
Preserve parameters in link headers (Mastodon API)
6 years ago
0fe715f3ba
Merge branch 'chore/merge-search-into-list-users' into 'develop'
...
Merge search endpoint into /users
See merge request pleroma/pleroma!898
6 years ago
39b766cc43
Merge branch 'bugfix/connect-src-https' into 'develop'
...
Plugs.HTTPSecurityPlug: Add static_url to CSP's connect-src
See merge request pleroma/pleroma!900
6 years ago
07f8c79a69
Merge branch 'bugfix/rel-me_list' into 'develop'
...
Web.RelMe: Fix having other values in rel attr
See merge request pleroma/pleroma!901
6 years ago
bc7570c282
[ #647 ] tests for web push
6 years ago
96901b6554
Merge branch 'fix/escape-reserved-chars-in-filenames' into 'develop'
...
Properly escape reserved URI charachters in upload urls
Closes #700
See merge request pleroma/pleroma!905
6 years ago
28d5b40d0a
Add handling of objects not in database
6 years ago
4263edc9c9
Properly escape reserved URI charachters in upload urls
6 years ago
bcd8ef65e0
Merge branch 'add-admin-to-node-info' into 'develop'
...
Include admins in nodeinfo
Closes #689
See merge request pleroma/pleroma!899
6 years ago
788a354ce0
Web.RelMe: Fix having other values in rel attr
...
One example of this is Github which puts a rel="nofollow me" on the
profile link.
6 years ago
fc37e5815f
Plugs.HTTPSecurityPlug: Add static_url to CSP's connect-src
...
Closes: https://git.pleroma.social/pleroma/pleroma/merge_requests/469
6 years ago
d1de0a30cc
Include admins in nodeinfo
6 years ago
2d30fc279f
Typo
6 years ago
b7aa1ea9e6
rich media: helpers: rework validate_page_url()
6 years ago
9f3cb38012
helpers: use AutoLinker to validate URIs as well as the other tests
6 years ago
d38d537bee
rich media: don't crawl bogus URIs
6 years ago
d45dbdce5a
Merge branch 'feature/add-status-text-to-notifications' into 'develop'
...
Add status text to notifications (mentions and reposts)
Closes #696
See merge request pleroma/pleroma!897
6 years ago
f620199836
Merge search endpoint into /users
6 years ago
0245ce842f
Remove unused code
6 years ago
cc7b35e097
Add status text to notifications (mentions and reposts)
6 years ago
ca5d894e68
Merge branch 'fix/like-adressing' into 'develop'
...
Stop adresssing like activities to actor's follower collection on non-public posts
See merge request pleroma/pleroma!896
6 years ago
33c614bce0
Stop adresssing like activities to actor's follower collection on non-public posts
6 years ago
22ac2288be
Merge remote-tracking branch 'pleroma/develop' into feature/disable-account
6 years ago
10248d86a2
Merge branch 'unify-follow' into 'develop'
...
Unify follow code with CommonAPI
Closes #690
See merge request pleroma/pleroma!889
6 years ago
eb84de0143
allow users to disable their own account
6 years ago
bf43f055dd
Set content types settings on mastofe endpoint.
6 years ago
b57913b13a
Fix supported TLS versions as TLS 1.3 support seems buggy.
6 years ago
1445dc25d4
fix format
6 years ago
aab86698a5
Expand "to" of delete activities
6 years ago
86e4b48a5e
Fix DM visibility for blocking users
6 years ago
594694607c
Unify Mastodon and Twitter follow implementations using CommonAPI
6 years ago
dd5865535e
Merge branch 'muting' into 'develop'
...
Don't stream muted accounts
See merge request pleroma/pleroma!888
6 years ago
818a7894da
Don't stream muted accounts
6 years ago
88a672fe88
Move LDAP code to LDAPAuthenticator. Use Authenticator for token_exchange with grant_type as well
6 years ago
19e2b85247
Merge remote-tracking branch 'upstream/develop' into feature/openldap-support
6 years ago
ace4231628
Merge branch 'features/bio_rel_me' into 'develop'
...
Add rel=me to the User bio
Closes #423
See merge request pleroma/pleroma!813
6 years ago
6c6a2dbfdd
Merge branch 'feature/add-pagination-to-users-admin-api' into 'develop'
...
Add pagination and search to users
See merge request pleroma/pleroma!873
6 years ago
b531e366df
Merge branch 'get-follow-requests-sql' into 'develop'
...
Use sql query in User.get_follow_requests/1 for filtering logic
See merge request pleroma/pleroma!883
6 years ago
413cf00cc3
Merge branch 'atomic-note-count-updates' into 'develop'
...
Atomic update for note count and follower count
See merge request pleroma/pleroma!885
6 years ago
c93479c6f5
Merge branch 'count-only-public-statuses' into 'develop'
...
Increment user note count only on public activities #703
See merge request pleroma/pleroma!884
6 years ago
d5418e9ff7
Remove follow_request_count as it's not needed for FE anymore.
...
MastoFE uses `GET /api/v1/follow_requests` and PleromaFE uses
`GET /api/pleroma/friend_requests` which they query on the initial page
load.
6 years ago
af0039a3a0
Use atomic update for note count and follower count
6 years ago
9b63fda9c7
Merge branch 'fix/dont-show-dms-in-mentions-timeline' into 'develop'
...
[#675 ] Do not show DMs in mentions timeline
See merge request pleroma/pleroma!877
6 years ago
c46950d3b1
Increment user note count only on public activities
6 years ago
1a1f4520cd
Use sql query in User.get_follow_requests/1 for filtering logic
6 years ago
2ec8cf5665
Add pagination to search
6 years ago
f38c316e6e
Merge branch 'bugfix/oauth-scopes-join' into 'develop'
...
Bugfix: OAuth scopes formatting
Closes #702
See merge request pleroma/pleroma!881
6 years ago
f2452d5700
Pleroma.User: mix format
6 years ago
8e6f7fdb86
RelMe.maybe_put_rel_me/2: When true put "me" otherwise nil
6 years ago
39a5bea9b7
Pleroma.User: Fix syntax and user.ap_id call
6 years ago
3d22642352
Pleroma.User: Pass an array to profile_urls
6 years ago
9b83236fb0
Pleroma.Web.RelMe: fixups
6 years ago
56d4e39012
Pleroma.User: Add rel=me to URLs where it linkbacks to the profile
6 years ago
b6a001a34c
Web.OAuth.OAuthController: Fix scopes Enum.join for OAuth response
6 years ago
f635b675b2
Refactor a little bit
6 years ago
f1a4c3163b
Show current user in users list as well
6 years ago
5b08b470f6
Add "local" params to users search
6 years ago
689b0730f8
activitypub: fix date header format
...
HTTP date header specification says that days must always be two-digit.
Accordingly, change the format string used to ensure days are always
represented as two-digit (e.g. 01).
6 years ago
2f00814475
Merge branch 'bugfix/236-ambiguous-route-for-numerical-handles' into 'develop'
...
Bugfix #236 Prefer user look-up by nickname
See merge request pleroma/pleroma!860
6 years ago
1341ee650e
[ #675 ] Do not show DMs in mentions timeline
6 years ago
28b4093233
mastodon websocket: return errors using ok, not stop
6 years ago
388a3f4ca2
mastodon websocket: bring back infinity timeout
6 years ago
46f29b9da1
Add search users endpoint
6 years ago
f1d37a5e23
mastodon websocket: use pattern match to get query data, robustly handle errors
6 years ago
bc53dff5b6
mastodon api: websocket: update code for cowboy 2.x
6 years ago
72b7a0797e
Use Mastodon API views in Admin API
6 years ago
a47cc5a2cf
Merge branch 'customizable_auth' into 'develop'
...
Authenticator tweaks
See merge request pleroma/pleroma!875
6 years ago
3281a3f074
Renamed *DatabaseAuthenticator to *Authenticator.
6 years ago
4e77f68414
Added `auth_template/0` to DatabaseAuthenticator.
6 years ago
cf426a719d
Merge branch 'with-mutes' into 'develop'
...
Add `with_muted` param.
Closes #683
See merge request pleroma/pleroma!872
6 years ago
90a24fbf95
Merge branch 'customizable_auth' into 'develop'
...
Auth customization support
See merge request pleroma/pleroma!852
6 years ago
089e2588a3
Merge branch 'speedup-follow-requests' into 'develop'
...
Speedup follow requests
Closes #677
See merge request pleroma/pleroma!871
6 years ago
3c849d0438
Merge branch 'deactivated-in-user-view' into 'develop'
...
Add activation status to the regular user view
See merge request pleroma/pleroma!874
6 years ago
b6f915313f
Made auth customization be runtime-configurable.
6 years ago
6b11011039
Added deactivated to the user view
6 years ago
2883f75a3a
Add pagination to users admin API
6 years ago
bbbdbec4fd
Remove parts of the old activity view.
...
Not used anymore.
6 years ago
9ade1242c2
Add user muted status info to twitterapi.
6 years ago
c1ae495878
Add user muted status info to MastodonAPI.
6 years ago
c4235f96bd
Add `with_muted` param.
6 years ago
b24cc44e8d
Follower requests: Utilize object index.
...
Closes #677
6 years ago
1536640962
mastodon api: embed relationship card under account card for Pleroma FE convenience
6 years ago
5d961d536c
fix formatter
6 years ago
c3ac9424d2
AutoLinker
6 years ago
90d0d055fc
Add more admin actions
6 years ago
e98d34e5fb
Added missing copyright headers.
6 years ago
fd46edb473
Merge remote-tracking branch 'remotes/origin/develop' into customizable_auth
6 years ago
e82b70eb53
Database authenticator behaviour / Pleroma implementation refactoring.
6 years ago
fc9d895ebc
twitter card: remove IO.inspect() spam
6 years ago
efa506b874
delegate user retrieval to the User module
6 years ago
e278d47023
OpenLDAP support
6 years ago
9e0686efa6
Move visibility into own module.
6 years ago
62296f5a25
Fix private post card handling.
6 years ago
afddce45b3
Minor setting name adjustment (:app_template -> :app_layout).
6 years ago
5a4e2905fe
Merge branch 'fix/twittercards' into 'develop'
...
Fix Twitter Cards
See merge request pleroma/pleroma!815
6 years ago
7c722c08f5
Fix: Fixing an outbox related bug when local user activity is empty
6 years ago
1097ce6d9f
Auth customization support.
...
OAuthController#create_authorization user retrieval / creation, errors handling, template & layout selection.
6 years ago
2813f28b6f
Merge branch 'bugfix/httpsig-sign-date' into 'develop'
...
activitypub: sign date header
Closes #649 and #364
See merge request pleroma/pleroma!847
6 years ago
f8a72f2997
activitypub: sign http date header
6 years ago
1803d9a022
fix fetching AP objects with application/json
6 years ago
22e2ed235d
logging: only return ISE reasons in API responses when in dev or test mode
6 years ago
8b08096436
logging: improve visibility into ISE errors
6 years ago
bff9eb5ef7
Reports
6 years ago
59c27f29c8
Add some nicer urls in status view.
6 years ago
b574d97c2e
[ #468 ] Added support for `push` OAuth scope (Mastodon 2.4+).
6 years ago
6fe7acd58e
[ #468 ] Merged `upstream/develop`.
6 years ago
11b3c10c54
Merge branch 'muting' into 'develop'
...
Implement muting, add it to the whole mastodon API
See merge request pleroma/pleroma!319
6 years ago
3ad91ec3c1
[ #468 ] Adjusted scope restriction for MastodonAPIController#index.
6 years ago
5a46d37af9
Update the mute implementation to the current codebase
...
Make it part of the info thing (and do a migration to ensure it's there)
6 years ago
465b547c90
Remove unused "muted" parameter, use piping for mute/block fns
6 years ago
092b1b1453
Do not unfollow muted users
6 years ago
da64ea4a55
Implement mastodon mutes endpoint
...
Aparently i forgot to add it, it gets a list of muted users
6 years ago
f41f017bbc
Implement muting, add it to the mastodon API
6 years ago
f4bfc628ca
Player: allow styles on CSP, loop videos
6 years ago
aa9af1d639
CSP: Allow iframes on embed player
6 years ago
2d21ea1a0e
Merge branch 'develop' into fix/twittercards
6 years ago
10a11f083c
Embed player suitable for Twitter Cards
6 years ago
25b9e7a8c3
Added admin API for changing user activation status
6 years ago
c0ecbf6669
[ #468 ] Merged `upstream/develop`.
6 years ago
1dd718e83c
Merge branch 'set-cache-on-user-tag-update' into 'develop'
...
Update user cache when user tags are updated
See merge request pleroma/pleroma!840
6 years ago
f25a3f4f78
Merge branch 'fix/check-follower-collection-in-is_private' into 'develop'
...
properly check for follower address in is_private?
See merge request pleroma/pleroma!841
6 years ago
f53dc5ee08
Merge branch 'fix/ap_id-unique_constraint' into 'develop'
...
mark ap_id unique_constraint
See merge request pleroma/pleroma!842
6 years ago
109b01a631
mark ap_id unique_constraint
6 years ago
96dcacade1
properly check for follower address in is_private?
6 years ago
fc35481445
Update user cache when user tags are updated
6 years ago
833161b5d2
Merge branch 'feature/jobs' into 'develop'
...
Job Queue
See merge request pleroma/pleroma!732
6 years ago
a39a094cda
Merge branch 'patch-image-description' into 'develop'
...
Patch to support image descriptions for pleroma-fe
See merge request pleroma/pleroma!626
6 years ago
7456338ed3
Merge branch 'feature/add-oauth-tokens-endpoint' into 'develop'
...
Add OAuth tokens endpoint
See merge request pleroma/pleroma!805
6 years ago
c23bd05737
Merge branch 'features/flavour-switching' into 'develop'
...
[MastoAPI] Add switching of frontend flavours
See merge request pleroma/pleroma!807
6 years ago
cd019a5927
Merge branch 'follow-request-count' into 'develop'
...
Follow request count
See merge request pleroma/pleroma!817
6 years ago
3f38a05571
Merge branch 'csv-export' into 'develop'
...
Add option to return all friends in twitter api.
Closes #602
See merge request pleroma/pleroma!833
6 years ago
94708d6370
Render only "id", "valid_until" and "app_name" in TokenView
6 years ago
f26582aae9
Merge branch 'mastoapi-stop-capping-attachments' into 'develop'
...
Remove a limit on attachments in Mastodon API and document the changes in responses from vanilla Mastodon
See merge request pleroma/pleroma!834
6 years ago
ae84af4ad0
Merge branch 'fix/hellthread-policy-recipient-check' into 'develop'
...
Fix recipient count in hellthread policy
See merge request pleroma/pleroma!836
6 years ago
d3fe2c8ec6
[ #468 ] Formatting fix.
6 years ago
bc4f77b10b
[ #468 ] Merged `upstream/develop`, resolved conflicts.
6 years ago
dcf24a3233
[ #468 ] Refactored OAuth scopes' defaults & missing selection handling.
6 years ago
8f98d970c1
Fix recipient count in hellthread policy
6 years ago
4df455f69b
[MastoAPI] Add switching of frontend flavours
6 years ago
96c725328b
Remove a limit on attachments in Mastodon API and document the changes in responses from vanilla mastodon
6 years ago
269d3e1ca6
WelcomeMessage: Get rid of Ecto reference.
6 years ago
38e15930cb
Add option to return all friends in twitter api.
...
Mainly useful for user export.
6 years ago
d812a347ca
Add optional welcome message.
6 years ago
2a4a4f3342
[ #468 ] Defined OAuth restrictions for all applicable routes.
...
Improved missing "scopes" param handling.
Allowed "any of" / "all of" mode specification in OAuthScopesPlug.
Fixed auth UI / behavior when user selects no permissions at /oauth/authorize.
6 years ago
1ce1b7b58d
Merge branch 'bugfix/oauth-token-padding' into 'develop'
...
oauth: never use base64 padding when returning tokens to applications
See merge request pleroma/pleroma!825
6 years ago
921571c19b
Merge branch 'hellthread-filter-fix' into 'develop'
...
Hellthread filter fix
Closes #634
See merge request pleroma/pleroma!831
6 years ago
c2e0a0c8d4
Readd threshold is not 0 check, optmization?
6 years ago
dca6bee2f7
Rename test, add check for follower collection when delisting
6 years ago
b63a5e309d
Merge branch 'bugfix/actor-containment' into 'develop'
...
activitypub: correctly handle bare URIs in user lookup
Closes #645
See merge request pleroma/pleroma!829
6 years ago
d943c90249
Add tests, change default config values, fix a bug
6 years ago
ecdf0657ba
Add logic for keeping follow_request_count up-to-date on the `follow`,
...
`approve_friend_request`, and `deny_friend_request` actions.
Add follow_request_count to the user view.
6 years ago
da44cdd381
user: search: use get_or_fetch() instead of get_or_fetch_by_nickname()
...
get_or_fetch() handles the nickname verses URI differences transparently.
6 years ago
ea2698beb7
Merge branch 'bugfix/activitypub-reserialization' into 'develop'
...
activitypub transmogrifier: fix reserialization edge cases
See merge request pleroma/pleroma!826
6 years ago
56862f4ce1
activitypub: clean up logging statements a little
6 years ago
04b1c13554
Merge remote-tracking branch 'upstream/develop' into patch-image-description
6 years ago
027adbc9e5
[ #468 ] Refactored OAuth scopes parsing / defaults handling.
6 years ago
3f32d7b937
Fix queue name
6 years ago
907306174b
fix S3 links encoding in Mediaproxy
6 years ago
72ba5b4ab7
activitypub: user view: formatting
6 years ago
5307c211b8
activitypub: user view: report totalItems=0 for follows/followers when hidden
6 years ago
6542b86292
activitypub: user view: remove totalItems from user outbox
...
(this is based on a counter in User.Info, but the counter is not reliable.)
6 years ago
ee2fa1a314
activitypub: user view: remove totalInbox from user inbox view
...
It is not really feasible to quickly calculate the totalItems value and
it shouldn't be trusted anyway.
6 years ago
bc9e5e6b65
Merge branch 'feature/activitypub-oauth-endpoints' into 'develop'
...
ActivityPub C2S oauth endpoints
See merge request pleroma/pleroma!821
6 years ago
64620d8980
activitypub: user view: do not expose oAuth endpoints for instance users
6 years ago
e9ef4b8da6
oauth: never use base64 padding when returning tokens to applications
...
The normal Base64 alphabet uses the equals sign (=) as a padding character. Since
Base64 strings are self-synchronizing, padding characters are unnecessary, so don't
generate them in the first place.
6 years ago
e05bf2940f
activitypub: transmogrifier: correctly handle nil inReplyTo value
6 years ago
94cbbb0e3a
activitypub: transmogrifier: do not attempt to expand pre-existing AS2 tag objects
6 years ago
kaniini