rinpatch
b028b0f97d
Merge branch 'bugfix/missing-announces' into 'develop'
...
fix up missing announcements with preloads
See merge request pleroma/pleroma!972
6 years ago
William Pitcock
26b0c802c3
fix up missing announcements with preloads
6 years ago
kaniini
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
kaniini
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
rinpatch
a7f58b3c13
Serve non-public activities in /api/v1/favourites
...
Fixes #648
6 years ago
Austin Lanari
6c96d68f77
add overriding truncated_namespace condition for truncating paths for digital ocean
6 years ago
rinpatch
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
Haelwenn (lanodan) Monnier
eab9425cc4
mrf/keyword_policy.ex: Fix when summary == nil, do not whitelist content == nil
6 years ago
William Pitcock
4aa699271c
activity: use left join instead of inner join when fetching activities that may or may not have a child object
6 years ago
William Pitcock
332dc1371b
user: use preloads when deleting accounts
6 years ago
William Pitcock
debf7f016d
ostatus: use preload objects with Object.normalize() when opportunistic
6 years ago
William Pitcock
3c2350cbee
object: downgrade normalize warning to debug severity
6 years ago
William Pitcock
8c70156157
activitypub: object view: use preloaded object when possible
6 years ago
William Pitcock
f9d5c13b21
activity: add get_by_ap_id_with_object()
6 years ago
William Pitcock
ce47eb8b29
activitypub: when fetching objects, use the preloaded object from the synthesized activity
6 years ago
William Pitcock
aabcecb269
notification: formatting
6 years ago
William Pitcock
07cdd9ed02
streamer: use the preloaded object if possible
6 years ago
William Pitcock
c62220c500
rich media: helpers: only crawl Create activities
6 years ago
William Pitcock
9a06d9f6e8
notification: preload child objects
6 years ago
William Pitcock
4cedf45423
relay: use preloaded object since we always have it
6 years ago
William Pitcock
e430a71d37
ostatus: fetch preloaded object in note handler for testsuite
6 years ago
William Pitcock
73efe95368
activitypub: allow skipping preload in some cases (like certain tests where the preload is obnoxious)
6 years ago
William Pitcock
ba7299fc87
activitypub: add missing with_preloaded_object()
6 years ago
William Pitcock
e4307cadc8
activitypub: splice in the child object if we have one
6 years ago
William Pitcock
a6973a668e
formatting
6 years ago
William Pitcock
59518cbcd8
activity: fix credo nitpick
6 years ago
William Pitcock
b3bf523c09
rich media: use optimized Object.normalize()
6 years ago
William Pitcock
e75e43b949
common api: use the optimized Object.normalize whenever possible
6 years ago
William Pitcock
9aea7cc224
activitypub: preload child objects when fetching timelines
6 years ago
William Pitcock
092cedede5
activity: add with_preloaded_object() convenience
6 years ago
William Pitcock
62bccddde0
object: add support for preloading objects when walking an activity graph in normal form
6 years ago
rinpatch
1b33986bfa
Fix text being nullable in TwitterAPI
6 years ago
lambda
fee360e581
Merge branch 'safe-mentions' into 'develop'
...
NodeInfo: Return safe_dm_mentions feature flag.
See merge request pleroma/pleroma!964
6 years ago
lain
e2afce34b6
NodeInfo: Return safe_dm_mentions feature flag.
6 years ago
rinpatch
3229c7a1d6
Ensure fts is prefered over trigram and use union_all instead of union in user search query
6 years ago
William Pitcock
27e03a2177
reports: fix up email generation for remote reports
6 years ago
kaniini
1c3d3d0c2b
Merge branch 'safe-mentions' into 'develop'
...
Add safe dm mode option.
See merge request pleroma/pleroma!958
6 years ago
William Pitcock
3cc2554fa3
mastodon api: add conversation_id extension (ref #674 )
6 years ago
William Pitcock
fea3696799
common api: move context functions from twitterapi
6 years ago
kaniini
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
rinpatch
88096c65a5
Move gluing search results from application to database and get mutuals
...
a higher score multiplier
6 years ago
Quentin Rameau
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
rinpatch
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
lain
bf27190f7f
UtilController: Return state of safe dm mentions.
6 years ago
lain
8468f3f6d4
Add safe dm mode option.
6 years ago
Ivan Tashkinov
af68a42ef7
[ #923 ] Support for multiple OAuth consumer strategies.
6 years ago
rinpatch
19a19bdd81
Fix migration timestamp type
6 years ago
rinpatch
9a7b817c9a
Ecto 3.0.5 migration
...
kms
6 years ago
Ivan Tashkinov
e17a9a1f66
[ #923 ] Nickname & email selection for external registrations, option to connect to existing account.
6 years ago
Maxim Filippov
7ac9fff437
Format
6 years ago
Maxim Filippov
ed8a2935f5
Use ILIKE to search users
6 years ago
William Pitcock
1685e4258f
transmogrifier: upgrade: when upgrading OStatus users to AP, ensure we always use the fake collection
6 years ago
William Pitcock
67ff8d9311
user: properly cope with actors which do not declare a followers collection
6 years ago
William Pitcock
cd055983c3
transmogrifier: when determining followers collection URI, we may need to fetch the actor
6 years ago
William Pitcock
d487b753c3
activitypub: transmogrifier: do not allow missing lists to be interpreted as nil
6 years ago
William Pitcock
798da28812
activitypub: transmogrifier: ensure as:Public activities are delivered to followers
6 years ago
kaniini
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
kaniini
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
Ivan Tashkinov
40e9a04c31
[ #923 ] Registration validations & unique index on [:user_id, :provider].
6 years ago
Ekaterina Vaartis
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
Ivan Tashkinov
8d21859717
[ #923 ] External User registration refactoring, password randomization.
6 years ago
Zachary Dunn
97b35e00b0
Fix with expression always matching
6 years ago
Zachary Dunn
e572786dad
Run
6 years ago
Zachary Dunn
af4338da0c
Use better error message
6 years ago
Ivan Tashkinov
26b6354095
[ #923 ] Support for multiple (external) registrations per user via Registration.
6 years ago
Zachary Dunn
5ba14c664b
Fix missing end brace
6 years ago
Zachary Dunn
a2e03d4f3c
Initial attempt at updating return type
6 years ago
eugenijm
1588688a11
Added support for exclude_types, limit, and min_id in Mastodon
...
notifications.
Unify Mastodon-compatible pagination logic.
6 years ago
Ivan Tashkinov
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
Haelwenn (lanodan) Monnier
f6fab01ba7
Web.Router: Add routes for Conversation mastoAPI
6 years ago
Fong-Wan Chau
4ed2618f6c
Allow 'rel' attribute on `<a>` link with specific values (for hashtag recognition).
6 years ago
Maxim Filippov
93291c3d7a
Order users by nickname
6 years ago
kaniini
6d6f48d079
Merge branch 'feature/federated-flags' into 'develop'
...
Federated reports
See merge request pleroma/pleroma!935
6 years ago
lambda
28df397454
Merge branch 'feature/oauth-me' into 'develop'
...
oauth: add me property to token responses
See merge request pleroma/pleroma!942
6 years ago
kaniini
c69dc2acf1
Merge branch 'feature/reblog-muting' into 'develop'
...
Implement mastodon's reblog hiding feature
See merge request pleroma/pleroma!916
6 years ago
William Pitcock
e0edc706cf
oauth: add me property to token responses
6 years ago
eugenijm
43fb03be5a
Allow to mark a single notification as read
6 years ago
kaniini
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
kaniini
8b352af4dd
Merge branch 'feature/openldap-support' into 'develop'
...
OpenLDAP support
Closes #203
See merge request pleroma/pleroma!859
6 years ago
Ivan Tashkinov
2739057442
Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
6 years ago
Ivan Tashkinov
aacbf0f570
[ #923 ] OAuth: prototype of sign in / sign up with Twitter.
6 years ago
Karen Konou
d8244c2a1b
remove unused function
6 years ago
Karen Konou
dfeb3aec44
fix credo warning
6 years ago
Karen Konou
094e1ef048
formatting
6 years ago
Karen Konou
da53c079db
Refactor to store user ap_id, add tests
6 years ago
Karen Konou
be465c762b
formatting
6 years ago
Karen Konou
15b21d1983
refactor filtering mechanism
6 years ago
Karen Konou
aa71139e4a
Fix elixir 1.8 vs 1.7 format conflict
6 years ago
Karen Konou
fe4c1d26fc
Add ActivityPub.contain_activity checks to streamer
6 years ago
Karen Konou
c8f31e0bc2
Implement mastodon's reblog hiding feature
6 years ago
Haelwenn
41fc67aa49
Merge branch 'mastoapi/mime_type' into 'develop'
...
Extend MastoAPI to provide attachment mimetypes
See merge request pleroma/pleroma!938
6 years ago
rinpatch
d7a34b604b
Extend MastoAPI to provide attachment mimetypes
6 years ago
rinpatch
d02f1120f9
Content-Disposition regex improvements
6 years ago
kaniini
0f42ea87d6
Merge branch 'notifications-is-seen' into 'develop'
...
MastoAPI notifications is_seen
See merge request pleroma/pleroma!934
6 years ago
kaniini
c708656b5e
Merge branch 'robotstxt' into 'develop'
...
Add robots.txt
Closes #723
See merge request pleroma/pleroma!929
6 years ago
William Pearson
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
rinpatch
958227d556
MediaProxy: parse filename from content-disposition for non-whitelisted types
6 years ago
eugenijm
100413bf2c
Add `is_seen` to MastoAPI notifications, extract rendering logic into separate NotificationView, add tests
6 years ago
William Pitcock
423fd07928
activitypub: inject to/cc fields on non-forwarded reports since Flag activities are now Forwardable
6 years ago
William Pitcock
5c7b774f09
reports: unify sending e-mail for both remote and local reports
6 years ago
William Pitcock
64b0120d67
activitypub: add support for forwarding reports
6 years ago
rinpatch
cbdd11c381
Merge develop to bump elixir version in the CI so I don't get failing formatting
6 years ago
William Pitcock
3b48d5f0c2
common api: add support for forwarding reports
6 years ago
William Pitcock
379442ad17
activitypub: utils: also match Activity objects
6 years ago
William Pitcock
0f3ecb2bfb
activitypub: transmogrifier: accept remote Flag activities
6 years ago
William Pitcock
f86f7dbb8f
activitypub: utils: rework make_flag_data to accept either activity payloads or IRIs
6 years ago
rinpatch
e2fe796c63
Add some tests
6 years ago
rinpatch
34fc0dca2e
Merge branch 'hotfix/delete-activities' into 'develop'
...
Fix delete activities not federating
See merge request pleroma/pleroma!933
6 years ago
rinpatch
e630e5e135
Fix delete activities not federating
6 years ago
link0ff
54e7087ab4
Merge remote-tracking branch 'upstream/develop' into feature/openldap-support
6 years ago
kaniini
59333f2d56
Merge branch 'admin-api-account-view-namespace' into 'develop'
...
MastodonAPI.Admin.AccountView → AdminAPI.AccountView
See merge request pleroma/pleroma!930
6 years ago
kaniini
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
Maxim Filippov
f3964f4024
Ensure empty array is returned for tags
6 years ago
Maxim Filippov
257d8e78e5
Add tags
6 years ago
kaniini
4e72762322
Merge branch 'mastofe-content-types' into 'develop'
...
Set content types settings on mastofe endpoint.
See merge request pleroma/pleroma!894
6 years ago
eugenijm
e416c344dd
Unify unfollow, accept and reject follow requests using CommonAPI
6 years ago
Maxim Filippov
490d9cf7b1
Add "local" to users admin API
6 years ago
Haelwenn (lanodan) Monnier
cc0f2f8ba3
MastodonAPI.Admin.AccountView → AdminAPI.AccountView
6 years ago
Haelwenn (lanodan) Monnier
d43b1c0b5d
Pleroma.Web.TwitterAPI.Controller: Remove duplicated alias/es
6 years ago
Haelwenn (lanodan) Monnier
4b73ca638e
[Credo][CI] Add readability as it’s fixed
6 years ago
Haelwenn (lanodan) Monnier
23960309a0
[Credo] Change quoted string with 3+ quotes to sigils
6 years ago
Haelwenn (lanodan) Monnier
c42d34b2ec
[Credo] fix Credo.Check.Readability.MaxLineLength
6 years ago
Haelwenn (lanodan) Monnier
8cd3eada7d
[Credo] write large numbers with underscore separation
6 years ago
Haelwenn (lanodan) Monnier
c3d41b2b6e
[Credo] make all variables use snake_case
6 years ago
Haelwenn (lanodan) Monnier
fb82f6fc7c
[Credo] Remove parentesis on argument-less functions
6 years ago
Haelwenn (lanodan) Monnier
a3a9cec483
[Credo] fix Credo.Check.Readability.AliasOrder
6 years ago
Haelwenn (lanodan) Monnier
4c440f12c3
[Credo] Fix the consistency
6 years ago
Haelwenn (lanodan) Monnier
6c8743d0c0
[Credo] Fix the warnings
6 years ago
Maxim Filippov
25eb6cf1cb
Add "roles" to users admin API
6 years ago
kaniini
c231ed610a
Merge branch 'masto-api-followers-following' into 'develop'
...
MastoAPI followers/following endpoints
See merge request pleroma/pleroma!924
6 years ago
link0ff
9338f061a3
Support LDAP method start_tls
6 years ago
Egor Kislitsyn
d013b58e84
add `mix pleroma.user delete_activities NICKNAME` task
6 years ago
eugenijm
984b5f8adf
MastoAPI followers/following endpoints
6 years ago
rinpatch
92a69bddce
escape quotation marks in Content-Disposition header
6 years ago
rinpatch
5a73cae2be
WIP: Stop mangling filenames
6 years ago
kaniini
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
lain
07277879e5
Linting.
6 years ago
lain
600f428db4
WebPush: Add activity id to the push messages.
...
Makes it easier to relate the push to a given status.
6 years ago
Ivan Tashkinov
63ab61ed3f
Sign in via Twitter (WIP).
6 years ago
lain
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
lambda
2c8deecdd2
Merge branch 'add-local-field-to-status' into 'develop'
...
MastoAPI StatusView: Add locality indicator.
See merge request pleroma/pleroma!920
6 years ago
lambda
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
Shpuld Shpuldson
50edead11c
Remove chromium input hilight that clashes with our own
6 years ago
Shpuld Shpuldson
8ddbedcd9a
Style again the login page to fit pleroma more
6 years ago
lain
4811eefa6e
MastoAPI StatusView: Add locality indicator.
6 years ago
eugenijm
6038c8a753
Broadcast deleted activity id on deletion to conform to MastoAPI streamig spec
6 years ago
William Pitcock
1f78d23eed
http: connection: unify adapter configuration and defaults
6 years ago
William Pitcock
ba48bd901c
http: connection: relax the timeouts a little
6 years ago
William Pitcock
19afd9f81f
http: rework connection timeouts to match hackney docs, enforce 1 second max TCP connection timeout
6 years ago
William Pitcock
773f532b14
http: actually pass the options list to the Connection factory
6 years ago
William Pitcock
50ba4ba2c9
http: connection: merge hackney option lists instead of concatenating them
...
this ensures the right pools are used
6 years ago
William Pitcock
2a83c0ba93
http: safely catch erlang exits and elixir errors from hackney (ref #672 )
6 years ago
kaniini
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
kaniini
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
kaniini
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
eugenijm
2827dfea50
Allow an admin to delete a user status
6 years ago
Ekaterina Vaartis
5021b7836f
Fetch user's outbox posts on first federation with that user
6 years ago
William Pitcock
e53a9fd15e
MRF: anti followbot: gracefully handle accounts without a display name
6 years ago
rinpatch
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
Karen Konou
c2faae70df
Adjust delete activity audience to match the deleted object
6 years ago
Karen Konou
6a69ece437
Revert existing object check
6 years ago
eugenijm
7342b5a45f
Preserve parameters in link headers (Mastodon API)
6 years ago
kaniini
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
kaniini
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
kaniini
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
Maksim
bc7570c282
[ #647 ] tests for web push
6 years ago
Haelwenn
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
Karen Konou
28d5b40d0a
Add handling of objects not in database
6 years ago
rinpatch
4263edc9c9
Properly escape reserved URI charachters in upload urls
6 years ago
rinpatch
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
Haelwenn (lanodan) Monnier
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
Haelwenn (lanodan) Monnier
fc37e5815f
Plugs.HTTPSecurityPlug: Add static_url to CSP's connect-src
...
Closes: https://git.pleroma.social/pleroma/pleroma/merge_requests/469
6 years ago
eugenijm
d1de0a30cc
Include admins in nodeinfo
6 years ago
Maxim Filippov
2d30fc279f
Typo
6 years ago
William Pitcock
b7aa1ea9e6
rich media: helpers: rework validate_page_url()
6 years ago
William Pitcock
9f3cb38012
helpers: use AutoLinker to validate URIs as well as the other tests
6 years ago
William Pitcock
d38d537bee
rich media: don't crawl bogus URIs
6 years ago
kaniini
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
Maxim Filippov
f620199836
Merge search endpoint into /users
6 years ago
Maxim Filippov
0245ce842f
Remove unused code
6 years ago
Maxim Filippov
cc7b35e097
Add status text to notifications (mentions and reposts)
6 years ago
kaniini
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
rinpatch
33c614bce0
Stop adresssing like activities to actor's follower collection on non-public posts
6 years ago
Egor Kislitsyn
22ac2288be
Merge remote-tracking branch 'pleroma/develop' into feature/disable-account
6 years ago
kaniini
10248d86a2
Merge branch 'unify-follow' into 'develop'
...
Unify follow code with CommonAPI
Closes #690
See merge request pleroma/pleroma!889
6 years ago
Egor Kislitsyn
eb84de0143
allow users to disable their own account
6 years ago
KokaKiwi
bf43f055dd
Set content types settings on mastofe endpoint.
6 years ago
KokaKiwi
b57913b13a
Fix supported TLS versions as TLS 1.3 support seems buggy.
6 years ago
Karen Konou
1445dc25d4
fix format
6 years ago
Karen Konou
aab86698a5
Expand "to" of delete activities
6 years ago
eugenijm
86e4b48a5e
Fix DM visibility for blocking users
6 years ago
eugenijm
594694607c
Unify Mastodon and Twitter follow implementations using CommonAPI
6 years ago
kaniini
dd5865535e
Merge branch 'muting' into 'develop'
...
Don't stream muted accounts
See merge request pleroma/pleroma!888
6 years ago
William Pearson
818a7894da
Don't stream muted accounts
6 years ago
link0ff
88a672fe88
Move LDAP code to LDAPAuthenticator. Use Authenticator for token_exchange with grant_type as well
6 years ago
link0ff
19e2b85247
Merge remote-tracking branch 'upstream/develop' into feature/openldap-support
6 years ago
kaniini
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
kaniini
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
kaniini
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
kaniini
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
kaniini
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
eugenijm
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
eugenijm
af0039a3a0
Use atomic update for note count and follower count
6 years ago
lambda
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
eugenijm
c46950d3b1
Increment user note count only on public activities
6 years ago
eugenijm
1a1f4520cd
Use sql query in User.get_follow_requests/1 for filtering logic
6 years ago
Maxim Filippov
2ec8cf5665
Add pagination to search
6 years ago
rinpatch
f38c316e6e
Merge branch 'bugfix/oauth-scopes-join' into 'develop'
...
Bugfix: OAuth scopes formatting
Closes #702
See merge request pleroma/pleroma!881
6 years ago
Haelwenn (lanodan) Monnier
f2452d5700
Pleroma.User: mix format
6 years ago
Haelwenn (lanodan) Monnier
8e6f7fdb86
RelMe.maybe_put_rel_me/2: When true put "me" otherwise nil
6 years ago
Haelwenn (lanodan) Monnier
39a5bea9b7
Pleroma.User: Fix syntax and user.ap_id call
6 years ago
Haelwenn (lanodan) Monnier
3d22642352
Pleroma.User: Pass an array to profile_urls
6 years ago
Haelwenn (lanodan) Monnier
9b83236fb0
Pleroma.Web.RelMe: fixups
6 years ago
Haelwenn (lanodan) Monnier
56d4e39012
Pleroma.User: Add rel=me to URLs where it linkbacks to the profile
6 years ago
Haelwenn (lanodan) Monnier
b6a001a34c
Web.OAuth.OAuthController: Fix scopes Enum.join for OAuth response
6 years ago
Maxim Filippov
f635b675b2
Refactor a little bit
6 years ago
Maxim Filippov
f1a4c3163b
Show current user in users list as well
6 years ago
Maxim Filippov
5b08b470f6
Add "local" params to users search
6 years ago
William Pitcock
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
lambda
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
rinpatch
1341ee650e
[ #675 ] Do not show DMs in mentions timeline
6 years ago
William Pitcock
28b4093233
mastodon websocket: return errors using ok, not stop
6 years ago
William Pitcock
388a3f4ca2
mastodon websocket: bring back infinity timeout
6 years ago
Maxim Filippov
46f29b9da1
Add search users endpoint
6 years ago
William Pitcock
f1d37a5e23
mastodon websocket: use pattern match to get query data, robustly handle errors
6 years ago
William Pitcock
bc53dff5b6
mastodon api: websocket: update code for cowboy 2.x
6 years ago
Maxim Filippov
72b7a0797e
Use Mastodon API views in Admin API
6 years ago
href
a47cc5a2cf
Merge branch 'customizable_auth' into 'develop'
...
Authenticator tweaks
See merge request pleroma/pleroma!875
6 years ago
Ivan Tashkinov
3281a3f074
Renamed *DatabaseAuthenticator to *Authenticator.
6 years ago
Ivan Tashkinov
4e77f68414
Added `auth_template/0` to DatabaseAuthenticator.
6 years ago
kaniini
cf426a719d
Merge branch 'with-mutes' into 'develop'
...
Add `with_muted` param.
Closes #683
See merge request pleroma/pleroma!872
6 years ago
href
90a24fbf95
Merge branch 'customizable_auth' into 'develop'
...
Auth customization support
See merge request pleroma/pleroma!852
6 years ago
kaniini
089e2588a3
Merge branch 'speedup-follow-requests' into 'develop'
...
Speedup follow requests
Closes #677
See merge request pleroma/pleroma!871
6 years ago
kaniini
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
Ivan Tashkinov
b6f915313f
Made auth customization be runtime-configurable.
6 years ago
eugenijm
6b11011039
Added deactivated to the user view
6 years ago
Maxim Filippov
2883f75a3a
Add pagination to users admin API
6 years ago
lain
bbbdbec4fd
Remove parts of the old activity view.
...
Not used anymore.
6 years ago
lain
9ade1242c2
Add user muted status info to twitterapi.
6 years ago
lain
c1ae495878
Add user muted status info to MastodonAPI.
6 years ago
lain
c4235f96bd
Add `with_muted` param.
6 years ago
lain
b24cc44e8d
Follower requests: Utilize object index.
...
Closes #677
6 years ago
William Pitcock
1536640962
mastodon api: embed relationship card under account card for Pleroma FE convenience
6 years ago
Egor Kislitsyn
5d961d536c
fix formatter
6 years ago
Egor
c3ac9424d2
AutoLinker
6 years ago
Maxim Filippov
90d0d055fc
Add more admin actions
6 years ago
Ivan Tashkinov
e98d34e5fb
Added missing copyright headers.
6 years ago
Ivan Tashkinov
fd46edb473
Merge remote-tracking branch 'remotes/origin/develop' into customizable_auth
6 years ago
Ivan Tashkinov
e82b70eb53
Database authenticator behaviour / Pleroma implementation refactoring.
6 years ago
William Pitcock
fc9d895ebc
twitter card: remove IO.inspect() spam
6 years ago
11backslashes
efa506b874
delegate user retrieval to the User module
6 years ago
link0ff
e278d47023
OpenLDAP support
6 years ago
lain
9e0686efa6
Move visibility into own module.
6 years ago
lain
62296f5a25
Fix private post card handling.
6 years ago
Ivan Tashkinov
afddce45b3
Minor setting name adjustment (:app_template -> :app_layout).
6 years ago
kaniini
5a4e2905fe
Merge branch 'fix/twittercards' into 'develop'
...
Fix Twitter Cards
See merge request pleroma/pleroma!815
6 years ago
KZ
7c722c08f5
Fix: Fixing an outbox related bug when local user activity is empty
6 years ago
Ivan Tashkinov
1097ce6d9f
Auth customization support.
...
OAuthController#create_authorization user retrieval / creation, errors handling, template & layout selection.
6 years ago
lambda
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
William Pitcock
f8a72f2997
activitypub: sign http date header
6 years ago
William Pitcock
1803d9a022
fix fetching AP objects with application/json
6 years ago
William Pitcock
22e2ed235d
logging: only return ISE reasons in API responses when in dev or test mode
6 years ago
William Pitcock
8b08096436
logging: improve visibility into ISE errors
6 years ago
Egor
bff9eb5ef7
Reports
6 years ago
lain
59c27f29c8
Add some nicer urls in status view.
6 years ago
Ivan Tashkinov
b574d97c2e
[ #468 ] Added support for `push` OAuth scope (Mastodon 2.4+).
6 years ago
Ivan Tashkinov
6fe7acd58e
[ #468 ] Merged `upstream/develop`.
6 years ago
lambda
11b3c10c54
Merge branch 'muting' into 'develop'
...
Implement muting, add it to the whole mastodon API
See merge request pleroma/pleroma!319
6 years ago
Ivan Tashkinov
3ad91ec3c1
[ #468 ] Adjusted scope restriction for MastodonAPIController#index.
6 years ago
Ekaterina Vaartis
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
Ekaterina Vaartis
465b547c90
Remove unused "muted" parameter, use piping for mute/block fns
6 years ago
Ekaterina Vaartis
092b1b1453
Do not unfollow muted users
6 years ago
Ekaterina Vaartis
da64ea4a55
Implement mastodon mutes endpoint
...
Aparently i forgot to add it, it gets a list of muted users
6 years ago
Ekaterina Vaartis
f41f017bbc
Implement muting, add it to the mastodon API
6 years ago
href
f4bfc628ca
Player: allow styles on CSP, loop videos
6 years ago
href
aa9af1d639
CSP: Allow iframes on embed player
6 years ago
Mark Felder
2d21ea1a0e
Merge branch 'develop' into fix/twittercards
6 years ago
href
10a11f083c
Embed player suitable for Twitter Cards
6 years ago
eugenijm
25b9e7a8c3
Added admin API for changing user activation status
6 years ago
Ivan Tashkinov
c0ecbf6669
[ #468 ] Merged `upstream/develop`.
6 years ago
lambda
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
lambda
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
lambda
f53dc5ee08
Merge branch 'fix/ap_id-unique_constraint' into 'develop'
...
mark ap_id unique_constraint
See merge request pleroma/pleroma!842
6 years ago
rinpatch
109b01a631
mark ap_id unique_constraint
6 years ago
rinpatch
96dcacade1
properly check for follower address in is_private?
6 years ago
eugenijm
fc35481445
Update user cache when user tags are updated
6 years ago
kaniini
833161b5d2
Merge branch 'feature/jobs' into 'develop'
...
Job Queue
See merge request pleroma/pleroma!732
6 years ago
kaniini
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
kaniini
7456338ed3
Merge branch 'feature/add-oauth-tokens-endpoint' into 'develop'
...
Add OAuth tokens endpoint
See merge request pleroma/pleroma!805
6 years ago
kaniini
c23bd05737
Merge branch 'features/flavour-switching' into 'develop'
...
[MastoAPI] Add switching of frontend flavours
See merge request pleroma/pleroma!807
6 years ago
kaniini
cd019a5927
Merge branch 'follow-request-count' into 'develop'
...
Follow request count
See merge request pleroma/pleroma!817
6 years ago
kaniini
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
Maxim Filippov
94708d6370
Render only "id", "valid_until" and "app_name" in TokenView
6 years ago
lambda
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
lambda
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
Ivan Tashkinov
d3fe2c8ec6
[ #468 ] Formatting fix.
6 years ago
Ivan Tashkinov
bc4f77b10b
[ #468 ] Merged `upstream/develop`, resolved conflicts.
6 years ago
Ivan Tashkinov
dcf24a3233
[ #468 ] Refactored OAuth scopes' defaults & missing selection handling.
6 years ago
rinpatch
8f98d970c1
Fix recipient count in hellthread policy
6 years ago
Haelwenn (lanodan) Monnier
4df455f69b
[MastoAPI] Add switching of frontend flavours
6 years ago
rinpatch
96c725328b
Remove a limit on attachments in Mastodon API and document the changes in responses from vanilla mastodon
6 years ago
lain
269d3e1ca6
WelcomeMessage: Get rid of Ecto reference.
6 years ago
lain
38e15930cb
Add option to return all friends in twitter api.
...
Mainly useful for user export.
6 years ago
lain
d812a347ca
Add optional welcome message.
6 years ago
Ivan Tashkinov
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
lambda
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
rinpatch
921571c19b
Merge branch 'hellthread-filter-fix' into 'develop'
...
Hellthread filter fix
Closes #634
See merge request pleroma/pleroma!831
6 years ago
Karen Konou
c2e0a0c8d4
Readd threshold is not 0 check, optmization?
6 years ago
Karen Konou
dca6bee2f7
Rename test, add check for follower collection when delisting
6 years ago
rinpatch
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
Karen Konou
d943c90249
Add tests, change default config values, fix a bug
6 years ago
eugenijm
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
William Pitcock
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
lambda
ea2698beb7
Merge branch 'bugfix/activitypub-reserialization' into 'develop'
...
activitypub transmogrifier: fix reserialization edge cases
See merge request pleroma/pleroma!826
6 years ago
William Pitcock
56862f4ce1
activitypub: clean up logging statements a little
6 years ago
Wim Vanderbauwhede
04b1c13554
Merge remote-tracking branch 'upstream/develop' into patch-image-description
6 years ago
Ivan Tashkinov
027adbc9e5
[ #468 ] Refactored OAuth scopes parsing / defaults handling.
6 years ago
Egor Kislitsyn
3f32d7b937
Fix queue name
6 years ago
Egor Kislitsyn
907306174b
fix S3 links encoding in Mediaproxy
6 years ago
William Pitcock
72ba5b4ab7
activitypub: user view: formatting
6 years ago
William Pitcock
5307c211b8
activitypub: user view: report totalItems=0 for follows/followers when hidden
6 years ago
William Pitcock
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
William Pitcock
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
kaniini
bc9e5e6b65
Merge branch 'feature/activitypub-oauth-endpoints' into 'develop'
...
ActivityPub C2S oauth endpoints
See merge request pleroma/pleroma!821
6 years ago
William Pitcock
64620d8980
activitypub: user view: do not expose oAuth endpoints for instance users
6 years ago
William Pitcock
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
William Pitcock
e05bf2940f
activitypub: transmogrifier: correctly handle nil inReplyTo value
6 years ago
William Pitcock
94cbbb0e3a
activitypub: transmogrifier: do not attempt to expand pre-existing AS2 tag objects
6 years ago
Mark Felder
f62c1d6266
Improve login error for OAuth flow
6 years ago
Ivan Tashkinov
063baca5e4
[ #468 ] User UI for OAuth permissions restriction. Standardized storage format for `scopes` fields, updated usages.
6 years ago
William Pitcock
9bd6ed975e
activitypub: user view: use route helpers instead of hardcoded URIs
6 years ago
William Pitcock
29e946ace4
activitypub: user view: add oauthRegistrationEndpoint to user profiles
6 years ago
William Pitcock
db8abd958d
activitypub: user view: fix up endpoints rendering
6 years ago
William Pitcock
90facd3598
user view: add AP C2S oauth endpoints to local user profiles
6 years ago
Karen Konou
bef9b9cb66
refactored code
6 years ago
Karen Konou
adcdd21f16
Merge branch 'develop' into hellthread-filter-fix
6 years ago
lain
88a4de24f9
User.follow_all: Respect blocks in both directions.
6 years ago
Maxim Filippov
760fec4cb8
Update token.ex
6 years ago
Maxim Filippov
62a45bdc11
Add revoke token
6 years ago
Maxim Filippov
61a4bc5095
Add OAuth tokens endpoint
6 years ago
hakabahitoyo
b7bc666200
bugfix mdii uploader
6 years ago
Karen Konou
1d727cd069
added checks for public url and follower collections
6 years ago
Haelwenn (lanodan) Monnier
da4c662af3
Plugs.HTTPSecurityPlug: Add webpacker to connect-src
6 years ago
Haelwenn (lanodan) Monnier
00e8f0b07d
Plugs.HTTPSecurityPlug: Add unsafe-eval to script-src when in dev mode
...
This is needed to run dev mode mastofe at the same time
6 years ago
Mark Felder
c984e8272a
Formatting
6 years ago
Mark Felder
4956ab5ea3
Fix compile
6 years ago
Mark Felder
ac7ef0999d
WIP: Fix Twitter Cards
...
Twitter cards were not passing any useful metadata. A few things were
being handled on Twitter's end by trying to match OpenGraph tags with
their own, but it wasn't working at all for media. This is an attempt to
fix that.
Common functions have been pulled out of opengraph and put into
utils. Twitter's functionality was entirely replaced with a direct copy
of Opengraph's and then modified as needed.
Profiles are now represented as Summary Cards
Posts with images are now represented as Summart with Large Image Cards
Posts with video and audio attachments are represented as Player Cards.
This now passes the Twitter Card Validator.
Validator and Docs are below
https://cards-dev.twitter.com/validator
https://developer.twitter.com/en/docs/tweets/optimize-with-cards/overview/abouts-cards
6 years ago
shibayashi
ea1058929c
Use url[:scheme] instead of protocol to determine if https is enabled
6 years ago
rinpatch
379d04692c
Filter summary in keywordpolicy
6 years ago
rinpatch
39383a6b79
Merge branch 'feature/thread-muting' into 'develop'
...
Feature/thread muting
See merge request pleroma/pleroma!796
6 years ago
lambda
044616292b
Merge branch 'feature/rich-media-limits' into 'develop'
...
rich media: tighten fetching timeouts and size limits
See merge request pleroma/pleroma!809
6 years ago
Karen Konou
ac72b578da
Merge branch 'develop' into feature/thread-muting
6 years ago
Karen Konou
c01ef574c1
Refactor as per Rin's suggestions, add endpoint tests
6 years ago
lambda
d53e36bf1e
Revert "Merge branch 'object-creation' into 'develop'"
...
This reverts merge request !802
6 years ago
Egor Kislitsyn
305d219413
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/jobs
...
# Conflicts:
# lib/pleroma/web/federator/federator.ex
# lib/pleroma/web/websub/websub.ex
6 years ago
William Pitcock
45e57dd187
rich media: tighten fetching timeouts and size limits
6 years ago
kaniini
6c8d15da11
Merge branch 'fix/credo-issues' into 'develop'
...
Fix credo issues
See merge request pleroma/pleroma!786
6 years ago
Karen Konou
cc21fc5f53
refactor, status view updating, error handling
6 years ago
rinpatch
e0de0fcf22
Merge branch 'object-creation' into 'develop'
...
Do object insertion through Cachex
See merge request pleroma/pleroma!802
6 years ago
kaniini
d5fe05c37e
Merge branch 'follow-enhancements' into 'develop'
...
Respect blocks in mass follow.
See merge request pleroma/pleroma!797
6 years ago
lain
f8388be9c6
Do object insertion through Cachex
...
So we don't flood our postgres logs with errors. Should also make things
slightly faster.
6 years ago
Karen Konou
6a150de3bd
Add unique index and unique constraint check, uniqueness test fails
6 years ago
Karen Konou
638456ce8f
elixir too new for CI's mix format lol
6 years ago
Karen Konou
a0d732ec55
it works!!
6 years ago
Haelwenn (lanodan) Monnier
d924dc73ba
de-group import/s
6 years ago
Haelwenn (lanodan) Monnier
6a6a5b3251
de-group alias/es
6 years ago
Ivan Tashkinov
a337bd114c
[ #468 ] MastodonAPI scope restrictions. Removed obsolete "POST /web/login" route.
6 years ago
Ivan Tashkinov
4ad843fb9d
[ #468 ] Prototype of OAuth2 scopes support. TwitterAPI scope restrictions.
6 years ago
Haelwenn (lanodan) Monnier
381fe44172
HTML.Scrubber.Default: Consistency
6 years ago
Haelwenn (lanodan) Monnier
2272934a5e
Stash
6 years ago
Haelwenn (lanodan) Monnier
d2e4eb7c74
Web.ActivityPub.ActivityPub: assign the Enum.filter to recipients & simplify it
6 years ago
Haelwenn (lanodan) Monnier
473095faf2
Web.Federator: Fix unused variable
6 years ago
Haelwenn (lanodan) Monnier
60ea29dfe6
Credo fixes: alias grouping/ordering
6 years ago
Haelwenn (lanodan) Monnier
106f4e7a0f
Credo fixes: parameter consistency
6 years ago
Haelwenn (lanodan) Monnier
8bcfac93a8
Make credo happy
6 years ago
lain
563f04e81b
Do autofollow first.
6 years ago
lain
bbd0049fae
Respect blocks in mass follow.
6 years ago
lambda
1eecbc1cd1
Merge branch 'feature/keyword-policy' into 'develop'
...
Add keyword policy
See merge request pleroma/pleroma!794
6 years ago
Karen Konou
7e47a810a2
help i am not good with git
6 years ago
Karen Konou
5c5b228f21
Added thread unmuting (still a bit buggy maybe)
6 years ago
Karen Konou
a44e532fb1
Added thread unmuting (still a bit buggy maybe)
6 years ago
rinpatch
7356659273
wow
6 years ago
Karen Konou
98ec578f4d
Merge branch 'develop' into feature/thread-muting
6 years ago
rinpatch
f88dec8b33
What idiot did that? (me)
6 years ago
rinpatch
6c21f5aa16
Merge branch 'develop' into feature/keyword-policy
6 years ago
rinpatch
8a0b755c19
rename ftl_removal to federated_timeline_removal to keep consistent naming with SimplePolicy
6 years ago
rinpatch
2174f6eb4f
Add default config for keyword policy
6 years ago
rinpatch
46aa8c18a2
Add keyword policy
6 years ago
Karen Konou
c43f414a79
Somehow fixed the repo insert [skip-ci]
6 years ago
Karen Konou
7e3ec93ed0
made a silly oopsie
6 years ago
Karen Konou
77448de492
ugghhhh
6 years ago
Ivan Tashkinov
2c68cf7e9e
OAuth2 security fixes: redirect URI validation, "Mastodon-Local" security breach fix.
...
(`POST /api/v1/apps` could create "Mastodon-Local" app wth any redirect_uris,
and if that happened before /web/login is accessed for the first time
then Pleroma used this externally created record with arbitrary
redirect_uris and client_secret known by creator).
6 years ago
Karen Konou
f4ff4ffba2
Migration and some boilerplate stuff
6 years ago
Mark Felder
74518d0b60
hide_followings was renamed to hide_followers in the FE, but never synced up in the BE
...
This was a dirty regex replace which worked on my server
6 years ago
Haelwenn
1220a17146
Merge branch 'bugfix/rich-media-card' into 'develop'
...
rich media cards: bugfixes and regression tests
See merge request pleroma/pleroma!785
6 years ago
kaniini
18e783bcb2
Merge branch 'add-admin-and-moderator-fields' into 'develop'
...
Add admin and moderator badges to user view and make their visibility configurable
See merge request pleroma/pleroma!767
6 years ago
William Pitcock
65a4b9fbea
mastodon api: rich media: don't clobber %URI struct with a string
6 years ago
rinpatch
f7aedbcc55
Merge branch 'fix/activitypub-user-view-badmap' into 'develop'
...
Fix if clause in activity_pub user_view
See merge request pleroma/pleroma!783
6 years ago
href
f753043ce0
Fix if clause in activity_pub user_view
6 years ago
Egor Kislitsyn
6f05f448f8
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/jobs
6 years ago
eugenijm
035eaeb9b8
Allow to configure visibility for admin and moderator badges
6 years ago
eugenijm
398c81f9c8
Add is_admin and is_moderator boolean fields to the user view
6 years ago
William Pitcock
d83dbd9070
rich media: parser: reject any data which cannot be explicitly encoded into JSON
6 years ago
kaniini
d120aa63f0
Merge branch 'fix-dm-index' into 'develop'
...
Massage index until it actually does the stuff we want.
See merge request pleroma/pleroma!772
6 years ago
kaniini
681ba1e52f
Merge branch 'feature/ap-c2s-whoami' into 'develop'
...
activitypub: c2s: add /api/ap/whoami endpoint for andstatus
See merge request pleroma/pleroma!773
6 years ago
kaniini
eb2b1960e0
Merge branch 'feature/split-hide-network-v2' into 'develop'
...
Split hide_network into hide_followers & hide_followings (fixed)
See merge request pleroma/pleroma!765
6 years ago
kaniini
ecdb0b7f57
Merge branch 'bugfix/rich-media-image-nil' into 'develop'
...
mastodon api: fix rendering of cards without image URLs (closes #597 )
Closes #597
See merge request pleroma/pleroma!777
6 years ago
William Pitcock
1d94b67e40
mastodon api: fix rendering of cards without image URLs ( closes #597 )
6 years ago
lambda
f8b831ecfd
Merge branch 'bugfix/transmogrifier-bare-tags' into 'develop'
...
activitypub: transmogrifier: fix bare tags
See merge request pleroma/pleroma!774
6 years ago
William Pitcock
a2bb5d890d
html: don't attempt to parse nil content
6 years ago
William Pitcock
e71ab5a10f
activitypub: transmogrifier: fix bare tags
6 years ago
William Pitcock
db1165f70f
activitypub: c2s: add /api/ap/whoami endpoint for andstatus
6 years ago
lain
f3c8b02d65
Massage index until it actually does the stuff we want.
...
Also makes the index a lot smoler.
6 years ago
Haelwenn
03991e7bc5
Merge branch 'feature/mrf-tag' into 'develop'
...
MRF TagPolicy engine
See merge request pleroma/pleroma!768
6 years ago
William Pitcock
7d110be119
activitypub: mrf: tag policy: fix force-unlisted and sandbox actions
6 years ago
William Pitcock
64a3993425
activitypub: mrf: tag policy: add support for subscription control
6 years ago
Egor Kislitsyn
14d967f515
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/jobs
6 years ago
rinpatch
3ae11835a9
Merge branch 'hotfix/hellthread-deprecation-warning' into 'develop'
...
fix hellthread threshold deprecation warning
See merge request pleroma/pleroma!770
6 years ago
Karen Konou
4031c94a59
fix hellthread threshold deprecation warning
6 years ago
William Pitcock
ff2c28fd6d
activitypub: mrf: tag policy: refactor the filtering hook a bit
6 years ago
William Pitcock
9a69f08e86
activitypub: mrf: tag policy: add support for processing follow requests
6 years ago
William Pitcock
084bb8ccd5
activitypub: mrf: tag policy: implement force-unlisted and sandbox
6 years ago
William Pitcock
88e32a32ce
mrf: add initial MRF.TagPolicy engine
6 years ago
kaniini
25a659d2dc
Merge branch 'mime-riff' into 'develop'
...
Mime: detect RIFF formats (wave, webp, avi)
See merge request pleroma/pleroma!769
6 years ago
href
127f99ae18
Mime: detect RIFF formats (wave, webp, avi)
6 years ago
rinpatch
00835bf678
Merge branch 'fix/rich-media-relative-path' into 'develop'
...
Fix rich media relative path
Closes #588
See merge request pleroma/pleroma!759
6 years ago
Egor Kislitsyn
3a3a3996b7
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/jobs
...
# Conflicts:
# lib/pleroma/web/activity_pub/activity_pub.ex
# lib/pleroma/web/federator/federator.ex
6 years ago
rinpatch
89762ad230
Merge branch 'feature/hellthread-filter-improvements' into 'develop'
...
Improve hellthread filter
Closes #584
See merge request pleroma/pleroma!766
6 years ago
Karen Konou
58262a8b8a
removed a debug thingy
6 years ago
Karen Konou
4430641349
squished a bug
6 years ago
Karen Konou
3cf046babb
actually commited the changes
6 years ago
Karen Konou
63a4f4b7be
fixed Map,put arguments, updated nomenclature
6 years ago
Karen Konou
583c4e0f17
more tweaks, fixed silly mistakes...
6 years ago
Karen Konou
e10cda7541
implemented tweaks
6 years ago
kaniini
c57f37bd36
Merge branch 'mogrify-orient' into 'develop'
...
Update Mogrify docs and warning for deprecated syntax
See merge request pleroma/pleroma!763
6 years ago
Karen Konou
531507a635
fixed things
6 years ago
Karen Konou
10130fa7d6
made toggleable, added docs
6 years ago
Karen Konou
0ef0ae35ab
added optional delist feature
6 years ago
Maxim Filippov
16ce129e38
Split hide_network into hide_followers & hide_followings (fixed)
6 years ago
lambda
69a38644bc
Merge branch '589-fix-cache' into 'develop'
...
Resolve "Update object cache on favs/boosts"
Closes #589
See merge request pleroma/pleroma!764
6 years ago
lain
505a084058
Still do caching in tests.
6 years ago
Mark Felder
0c08bd4181
Update Mogrify docs and warning for deprecated syntax to encourage
...
users to enable both strip and auto-orient
6 years ago
Ivan Tashkinov
3913b0196e
[ #582 ] Made single-pub task call Instance.set_reachable/1 if `set_reachable` is not specified.
...
Added tests.
6 years ago
Ivan Tashkinov
b40b4bc4e5
[ #582 ] Optimized federation retirement by reducing the number of SQL calls
...
(calling `Instances.set_reachable/1` only if instance had `unreachable_since`,
calling `Instances.set_unreachable/1` only if instance had nil `unreachable_since`).
6 years ago
Maxim Filippov
2c59eb3cfc
Add responsive features to layout
6 years ago
rinpatch
68d461b3a9
Check if rich media uri is relative
6 years ago
rinpatch
833404f0f5
Use with instead of if in the card
6 years ago
rinpatch
e4d18f328b
merge only if page_url is an absolute path
6 years ago
rinpatch
cbadf9d333
Fix rich media relative path
6 years ago
kaniini
486749064f
Revert "Merge branch 'feature/split-hide-network' into 'develop'"
...
This reverts merge request !733
6 years ago
href
28bfb09b01
Merge branch 'hotfix/object-normalize-cache' into 'develop'
...
object: use cached accesses when possible in Object.normalize()
See merge request pleroma/pleroma!757
6 years ago
href
ffbf306c9a
Merge branch 'streaming-api-url-fix' into 'develop'
...
Fix WebSocket streaming API URL.
See merge request pleroma/pleroma!756
6 years ago
William Pitcock
af10ef8d4e
object: use cached accesses when possible in Object.normalize()
6 years ago
eugenijm
a184811a60
Use url() instead of static_url in Endpoint.websocket_url()
6 years ago
href
7e384a2425
Merge branch 'develop' into 'develop'
...
Use nodeinfo 2.1
See merge request pleroma/pleroma!753
6 years ago
Luna
9cac8729af
update nodeinfo version when requesting 2.1
6 years ago
eugenijm
d747bd9870
Use String.replace_leading instead of String.replace for getting websocket streaming api url.
...
Extract the login responsible for obtaining websocket URL into the corresponding
Endpoint function.
6 years ago
Luna
1cdcee89da
mix format pass
6 years ago
Luna
23b1c64a19
downcase software name in nodeinfo
6 years ago
Luna
b17ce875cf
keep compatibility with nodeinfo 2.0
...
splits actual nodeinfo generation into raw_nodeinfo, the 2.0 handler
gives the same result, while the 2.1 handler inserts the
software.repository field. requested by @href
6 years ago
Haelwenn (lanodan) Monnier
74c6119f28
MastodonAPI.MastodonAPIController: Return a 404 when we fail to get a list
6 years ago
Luna
cd6db6abe4
use Mix.Project.Config for some Application functions
6 years ago
kaniini
0a82a7e6d6
Merge branch 'feature/split-hide-network' into 'develop'
...
Split hide_network into hide_followers & hide_followings
See merge request pleroma/pleroma!733
6 years ago
lambda
fc7644798d
Merge branch 'serve-sw-pleroma.js' into 'develop'
...
Serve sw-pleroma.js properly
See merge request pleroma/pleroma!754
6 years ago
href
fa5ec765d9
Serve sw-pleroma.js properly
6 years ago
lain
01d483f9c7
Merge remote-tracking branch 'origin/develop' into fix-rich-media-toggle
6 years ago
href
b3b0855456
Merge branch '534_federation_targets_reachability' into 'develop'
...
[#534 ] Unreachable federation targets retirement
Closes #534
See merge request pleroma/pleroma!703
6 years ago
Luna
b0c4c082c4
mix format pass
6 years ago
Luna
c05928dbda
use nodeinfo 2.1, add repository field
...
that is the only change from nodeinfo 2.0 to 2.1
also this makes the nodeinfo tests use 2.1.json instead of 2.0.json
6 years ago
lain
b19b4f8537
Remove default value for rich media.
...
Setting it to true will actually override a 'false' set before.
6 years ago
href
308b35ebe2
User.follow_all: ensure its stays unique
6 years ago
lambda
44913c1019
Merge branch 'bugfix/rich-media-non-unicode' into 'develop'
...
rich media non-unicode bugfix
See merge request pleroma/pleroma!749
6 years ago
William Pitcock
46dba03098
rich media: parser: only try to validate strings, not numbers (OEmbed)
6 years ago
William Pitcock
dafb6f0b5e
rich media: parser: reject OGP fields we cannot safely process
6 years ago
rinpatch
7057891db6
Make rich media support toggleable
6 years ago
lambda
a43a1c6d4e
Revert "Merge branch 'spc-fix-3' into 'develop'"
...
This reverts merge request !682
6 years ago
kaniini
4d3655c479
Merge branch 'spc-fix-3' into 'develop'
...
Spc fix 3
See merge request pleroma/pleroma!682
6 years ago
Haelwenn
00d4333373
Merge branch 'features/glitch-soc-frontend' into 'develop'
...
Features/glitch soc frontend
See merge request pleroma/pleroma!192
6 years ago
Egor Kislitsyn
58e250d9d2
fix merge
6 years ago
Egor Kislitsyn
d3677d2b4d
Merge remote-tracking branch 'MAIN/develop' into feature/jobs
6 years ago
lambda
6b54a3ec0b
Merge branch 'multiple-hackney-pools' into 'develop'
...
Fix 4aff4efa
typos
See merge request pleroma/pleroma!743
6 years ago
href
5ea0397e2d
Fix 4aff4efa
typos
6 years ago
kaniini
bd5086731e
Merge branch 'multiple-hackney-pools' into 'develop'
...
Use multiple hackney pools
See merge request pleroma/pleroma!739
6 years ago
lain
47ec690c54
Use race-condition free mass follow.
6 years ago
lain
935e65e261
Use race-condition free following method.
6 years ago
Egor Kislitsyn
ab31adf15b
tiny improve
6 years ago
href
4aff4efa8d
Use multiple hackney pools
...
* federation (ap, salmon)
* media (rich media, media proxy)
* upload (uploader proxy)
Each "part" will stop fighting others ones -- a huge federation outbound
could before make the media proxy fail to checkout a connection in time.
splitted media and uploaded media for the good reason than an upload
pool will have all connections to the same host (the uploader upstream).
it also has a longer default retention period for connections.
6 years ago
kaniini
7a2c4f984b
Merge branch 'bugfix/fix-rejects' into 'develop'
...
follow request fixups
Closes #537
See merge request pleroma/pleroma!734
6 years ago
kaniini
d03a116654
Merge branch 'hj-happiness-improvement' into 'develop'
...
New frontend configuration mechanism.
Closes #445
See merge request pleroma/pleroma!700
6 years ago
William Pitcock
57549f6043
activitypub: utils: update the state of *any* pending follow relationship that matches the actor and target
6 years ago
William Pitcock
cbb2b709de
activitypub: transmogrifier: fix follow request rejections
6 years ago
Ivan Tashkinov
92753b0cd9
[ #534 ] Made federation push sender be determined basing on content instead of `referer` header. Updated tests.
6 years ago
Haelwenn
ebb3496386
Merge branch 'feature/rich-media-part-2-electric-boogaloo' into 'develop'
...
Rich Media support, part 2.
See merge request pleroma/pleroma!719
6 years ago
William Pitcock
61d6715714
rich media: oembed: return data in the same format as the other parsers
6 years ago
William Pitcock
ddb5545202
rich media: kill some testsuite noise
6 years ago
William Pitcock
0f11254a06
rich media: parser: add some basic sanity checks on the returned data with pattern matching
6 years ago
William Pitcock
83b7062634
rich media: parser: cache negatives
6 years ago
William Pitcock
8fb16e9f0f
rich media: parser: add copyright header
6 years ago
Maxim Filippov
50d6183893
Split hide_network into hide_followers & hide_followings
6 years ago
Egor Kislitsyn
1724a6b34b
add spec back
6 years ago
Egor Kislitsyn
56533495b5
fix defaults
6 years ago
Egor Kislitsyn
b2e9700785
cleanup
6 years ago
Egor Kislitsyn
55affbca7f
add a job queue
6 years ago
lain
f53d464db0
Put deprecation warnings undre Pleroma.Config.
6 years ago
Ivan Tashkinov
d3f9e6f6fe
[ #534 ] Merged `upstream/develop`.
6 years ago
Ivan Tashkinov
1d2f41642c
[ #534 ] Various tweaks. Tests for Instances and Instance.
6 years ago
lain
8e8a1e1ba8
Return new-style config if old-style config is set to false.
...
This is in preparation for 1.0. We'll be able to switch the config to the new
mechanism on PleromaFE then as well.
6 years ago
lain
f1d58c5c49
Don't run warnings in a task.
6 years ago
Haelwenn
de0fb88a9c
Merge branch 'safe-render-activities' into 'develop'
...
remove unnecessary filter (re !723 )
See merge request pleroma/pleroma!729
6 years ago
href
df2f7b39dd
re f83bae7c: remove unnecessary filter
6 years ago
lain
f231313b70
Add deprecation warning mechanism.
6 years ago
lain
1825118fd4
Correctly handle invalid credentials on auth login.
...
Closes #407
6 years ago
Ivan Tashkinov
9560abea10
[ #534 ] Refactoring / tweaks per MR review.
6 years ago
William Pitcock
ddc7ae2c1a
mastodon api: card: force OGP images through mediaproxy
6 years ago
William Pitcock
ebeabdcc72
rich media: helpers: clean up unused aliases
6 years ago
William Pitcock
91ef64a1ec
activitypub: prime OGP crawler cache when new messages are inserted into the database
6 years ago
William Pitcock
8e42251e06
rich media: add helpers module, use instead of MastodonAPI module
6 years ago
William Pitcock
24a103a1fe
mastodon api: formatting
6 years ago
William Pitcock
6096846f5f
API: kill /api/rich_media/parse endpoint
6 years ago
William Pitcock
07a9a891ad
twitter api: fix up activity representer
6 years ago
William Pitcock
de42646634
rich media: add try/rescue to ensure we catch parsing and fetching failures
6 years ago
William Pitcock
5d895093fd
twitter api: embed card in twitterapi posts
6 years ago
William Pitcock
5a37ddc2dc
mastodon api: embed card in status object
6 years ago
William Pitcock
132d815f1f
mastodon api: factor out status card fetching, move status card rendering to statusview, add opengraph extended data
6 years ago
Haelwenn (lanodan) Monnier
cda1470e02
[MastoAPI][GlitchAPI] Add bookmarks
6 years ago
Haelwenn (lanodan) Monnier
872241d7c5
/web/index template: Modify for glitch-soc
6 years ago
href
71bb90073b
/notice/:id - send the FE index even if 404
...
this allows to open private activities by URL when you are logged in,
and to let the FE display a 404 page
6 years ago
lambda
16ab1437d6
Merge branch 'safe-render-activities' into 'develop'
...
Views: wrap activity rendering in a rescue
See merge request pleroma/pleroma!723
6 years ago
lain
2e277dd4ad
Fix objects.
6 years ago
kaniini
ea12371a01
Merge branch 'discard-invalid-likes' into 'develop'
...
Transmogrifier: fix incoming objects with invalid likes
See merge request pleroma/pleroma!724
6 years ago
href
77f2137383
Transmogrifier: fix incoming objects with invalid likes
6 years ago
href
f83bae7c22
Views: wrap activity rendering in a rescue
...
this avoids complete timeline breakage when an activity fucks up
rendering.
6 years ago
kaniini
9af798ad40
Merge branch 'flake-random-worker-id' into 'develop'
...
Flake: random worker id
See merge request pleroma/pleroma!721
6 years ago
href
e0e0cc5ab0
Flake: random worker id
6 years ago
kaniini
5eb81d2c72
Merge branch 'features/mastoapi-multi-hashtag' into 'develop'
...
MastodonAPI multi-hashtag
See merge request pleroma/pleroma!652
6 years ago
Haelwenn (lanodan) Monnier
a65c188593
Web.MastodonAPI.AccountView: Add is_moderator and is_admin
...
Closes: https://git.pleroma.social/pleroma/pleroma/issues/557
6 years ago
William Pitcock
8f2f471e94
rich media: gracefully handle fetching nil URIs
6 years ago
kaniini
155a884300
Merge branch 'flake-from-int' into 'develop'
...
Flake: support integers in from_string/1
See merge request pleroma/pleroma!715
6 years ago
href
d6015338c8
Flake: support integers in from_string/1
...
Some previously issued stateless tokens have integer ids in them.
6 years ago
kaniini
3e66723f7e
Merge branch 'join-in-preloads' into 'develop'
...
Join on preloads to avoid N+1 queries
See merge request pleroma/pleroma!714
6 years ago
Haelwenn (lanodan) Monnier
de956b9e04
Web.MastodonAPI.MastodonAPIController: tag+any bookmark params in a array and flatten it
6 years ago
William Pitcock
1f7843b9b8
mastodon api: use OGP uri instead of page_url for deducing domain name, fix test
6 years ago
William Pitcock
86037e9c39
mastodon api: use HTML.extract_first_external_url()
6 years ago
href
8018ae7ae5
Join on preloads to avoid N+1 queries
6 years ago
William Pitcock
be9abb2cc5
html: add utility function to extract first URL from an object and cache the result
6 years ago
William Pitcock
78047d57bf
mastodon api: provider_name setting is required too on the card
6 years ago
Haelwenn (lanodan) Monnier
39863236eb
Web.MastodonAPI.MastodonAPIController: generic get_status_card/1 function for MastoAPI 2.6.x
...
Mastodon API 2.6.x added a card key to the Status object so the Card can be shown in the timeline without an extra request at each status.
6 years ago
Haelwenn (lanodan) Monnier
3f64379b13
Web.MastodonAPI.MastodonAPIController: Add Rich-Media support
6 years ago
Haelwenn (lanodan) Monnier
5a84def6a6
Fix the logic in multi-hashtag TLs
6 years ago
Haelwenn (lanodan) Monnier
4ad0ad14ed
Web.ActivityPub.ActivityPub: Simplify multi-hashtag, add tests
6 years ago
Haelwenn (lanodan) Monnier
1a9bb4daa0
[Web.ActivityPub.ActivityPub]: Fix restrict_tag()
...
Thanks to Senko-san <kurisu@iscute.moe> for the help on array-matching
6 years ago
Haelwenn (lanodan) Monnier
f9cae0d04f
[WIP,MastoAPI] Multi-tag timelines
6 years ago
Haelwenn (lanodan) Monnier
15aa45ae8a
Web.ActivityPub.ActivityPub: Fix check_remote_limit/1 against activities with content: nil
6 years ago
Ivan Tashkinov
060d280e64
[ #534 ] Made Salmon.send_to_user calls be handled through Federator.enqueue.
6 years ago
lain
aa8ddfdbe2
SPC fixes: Fix activities.
6 years ago
Ivan Tashkinov
465adedb7c
[ #534 ] Websub fix: made SQL use UTC time zone when comparing with `valid_until` (instead of postgresql-server default time zone).
6 years ago
Ivan Tashkinov
656ed7c84a
[ #534 ] Configurable outgoing federation reachability timeout.
6 years ago
rinpatch
3a5b3c5a3a
Merge remote-tracking branch 'pl/develop' into oembed_provider
6 years ago
kaniini
4c99b6d35a
Merge branch 'fix/tusky-dm' into 'develop'
...
Add actor to recipients list
Closes #390
See merge request pleroma/pleroma!683
6 years ago
kaniini
c9b418e547
Merge branch 'develop' into 'oembed_provider'
...
# Conflicts:
# lib/pleroma/activity.ex
6 years ago
kaniini
4df71cd88b
Merge branch 'classic-flakeids' into 'develop'
...
Flake Ids for Users and Activities
Closes #450
See merge request pleroma/pleroma!645
6 years ago
Maxim Filippov
9274cabe01
Use correct logic to determine "attentions" list
6 years ago
Ivan Tashkinov
3e9399ec0b
[ #534 ] Optimized bulk publish ops to filter on reachability early. `Instance` refactoring.
6 years ago
href
a3ba72d978
Fix clippy with one/five lines
6 years ago
Ivan Tashkinov
8654a591f0
[ #534 ] Updating external instances reachability on incoming federation.
6 years ago
href
be43aa2875
FlakeId: ignore null mac for workerid, use first mac
6 years ago
William Pitcock
54ec6d09b0
mrf: add anti-followbot policy
6 years ago
Ivan Tashkinov
20b54366ee
[ #534 ] Federation publish requests status control (enforced 2xx response code check).
6 years ago
Maxim Filippov
4333fea1dc
Send "hide_network" in user_view
6 years ago
Ivan Tashkinov
f161a92cb1
[ #534 ] Initial implementation of unreachable federation targets retirement.
6 years ago
kaniini
4a278cd80a
Merge branch 's3-namespace' into 'develop'
...
S3 uploader: support for namespaced bucket
Closes #532
See merge request pleroma/pleroma!699
6 years ago
lain
2de208817c
Merge branch 'develop' into rename/pleroma_activity_consistency
6 years ago
lain
e221c681dc
New frontend configuration mechanism.
6 years ago
href
a92c43bc4b
Clippy!
6 years ago
href
973c9eed18
Treat User.Info pinned ids as strings
6 years ago
href
e36a434b99
FlakeId.from_string/1: remove old, un-needed conversion
6 years ago
href
422e60ad76
2019
6 years ago
href
cdc5e6ff5c
ActivityPub: restrict_since/restrict_max: ignore empty param
6 years ago
href
9d63b27dcd
Test FlakeID old id compat & Ecto type
6 years ago
href
28d77e373c
Flake Ids for Users and Activities
6 years ago
Haelwenn
707cd9389c
Merge branch 'fix/activity_get_by_id' into 'develop'
...
Add get_by_id to activity.ex
See merge request pleroma/pleroma!695
6 years ago
Ivan Tashkinov
34d59e4008
[ #502 ] Fixed User.active_local_user_query to return users with nil or missing `info.deactivated`. Adjusted test.
6 years ago
rinpatch
e460820fcf
Add get_by_id to activity.ex
6 years ago
href
f9a3269099
Uploader callback controller
6 years ago
href
99763999c1
reverse_proxy - always override plug's cache-control
6 years ago
href
97412d9f94
S3 Namespace
6 years ago
lambda
8cd853ce0c
Merge branch '530_federator_user_info_overwrite_fix' into 'develop'
...
[#530 ] Prevents user `info` from being overwritten because of race conditions
Closes #530
See merge request pleroma/pleroma!691
6 years ago
lambda
69454c8345
Merge branch 'feature/dm-sanity' into 'develop'
...
DM sanitization
See merge request pleroma/pleroma!458
6 years ago
Ivan Tashkinov
a4d3fec8a7
[ #502 ] Code comments update.
6 years ago
Ivan Tashkinov
aa480f4a8b
[ #530 ] Prevents user `info` from being overwritten because of race conditions
...
and non-partial update of embed (in WebFinger.ensure_keys_present and other places).
6 years ago
Haelwenn (lanodan) Monnier
7390192c03
Activity: mix format (2 empty lines)
6 years ago
Haelwenn (lanodan) Monnier
98c8184c1f
Activity: get_create_activity_by_object_ap_id/1 → get_create_by_object_ap_id/1
6 years ago
Haelwenn (lanodan) Monnier
2fdbd4d137
Activity: create_activity_by_object_id_query/1 → create_by_object_ap_id/1 when is_list
6 years ago
Haelwenn (lanodan) Monnier
f8ab1b7427
Activity: get_all_by_object_ap_id/1 → get_all_create_by_object_ap_id/1
6 years ago
Haelwenn (lanodan) Monnier
4ad5a0abb9
Activity: all_by_object_ap_id_q/1 → create_by_object_ap_id/1
6 years ago
Haelwenn (lanodan) Monnier
75e4c8f0b2
Activity: all_non_create_by_object_ap_id_q → by_object_ap_id
6 years ago
Haelwenn (lanodan) Monnier
b82c6dc536
Activity: all_by_object_ap_id/1 → get_all_by_object_ap_id/1
6 years ago
lain
cf1f35a93a
Send delete event over Mastodon streaming api
...
Closes #116
6 years ago
lambda
f3045a179e
Merge branch 'i1t/pleroma-477_user_search_improvements' into 'develop'
...
I1t/pleroma 477 user search improvements
See merge request pleroma/pleroma!685
6 years ago
lain
5834b08fe7
Set custom similarity limit.
6 years ago
William Pitcock
aa37313416
activitypub: short-circuit is_public?() with directMessage flag check
6 years ago
William Pitcock
7c9749f793
transmogrifier: slightly clean up fix_explicit_addressing pipeline
6 years ago
William Pitcock
420651157b
transmogrifier: don't apply heuristics against messages which have `directMessage` set true
6 years ago
William Pitcock
ddae43eb43
activitypub: add is_private?/is_direct? helpers
6 years ago
William Pitcock
9adc80afff
common api: set directMessage flag on our own posts
6 years ago
William Pitcock
75dfa1f0b0
mastodon api: get_visibility(): DMs never have a cc list.
6 years ago
William Pitcock
681f40ee5c
activitypub: transmogrifier: fix up to/cc addressing brain damage caused by mastodon-style explicit DMs
6 years ago
William Pitcock
8d06be35e0
activitypub: utils: add determine_explicit_mentions() and tests
6 years ago
kaniini
42612b1c8d
Merge branch 'bugfix/improve-boost-targeting' into 'develop'
...
improve handling of non-public Announces
See merge request pleroma/pleroma!681
6 years ago
lain
b108aeee08
Make use of the indices.
...
Indices in postgresql rely on operators, so they won't be used if you use only functions.
6 years ago
rinpatch
44693fbf6e
Formating
6 years ago
rinpatch
afd83db0d7
Provide local og:url for remote activities
6 years ago
kaniini
651ce1c97b
Merge branch '491_full_mentions_in_user_bio' into 'develop'
...
[#491 ] Made user bio preserve full nicknames (nick@host)
Closes #491
See merge request pleroma/pleroma!676
6 years ago
Maxim Filippov
651a1d64b5
Add current user to mentioned
6 years ago
Maxim Filippov
e116e55cab
Add actor to recipients
6 years ago
lain
bd6c12592e
Add migration to fix spc users.
6 years ago
lain
5d4d51e6dc
Add fixes for SPC users.
6 years ago
rinpatch
74346a7035
Fix merge conflict
6 years ago
Ivan Tashkinov
79e44042bc
[ #477 ] User trigram index adjustment.
6 years ago
Ivan Tashkinov
ed8f55ab8e
[ #477 ] User: FTS and trigram search results mixing (to handle misspelled requests).
6 years ago
rinpatch
997f4a5e09
Remove custom emojis and trailing whitespaces from previews
6 years ago
rinpatch
1b1af4798a
Use object instead of activity for metadata
6 years ago
Ivan Tashkinov
65bb9b2fba
[ #491 ] Made full nicknames be preserved in user links text only in Bio.
6 years ago
William Pitcock
75a9b2a851
activitypub: add a match clause for objects, not just activities
6 years ago
William Pitcock
dbc4e92509
activitypub: transmogrifier: do not clobber the addressing on relayed announcements
6 years ago
William Pitcock
33b473cc02
activitypub: allow is_public?() to work on any type of map representing an AS2 object
6 years ago
William Pitcock
8e9f1d5587
activitypub: relay: chase selective public announce changes
6 years ago
William Pitcock
2479e88815
activitypub: announce: add new public parameter
6 years ago
kaniini
98d9dcd509
Merge branch '502_instance_stats_active_users_count_fix' into 'develop'
...
[#502 ] Fixed `user_count` in `/api/v1/instance` to include only active local users
Closes #502
See merge request pleroma/pleroma!678
6 years ago
kaniini
ae8a5942cf
Merge branch 'bad-copy-paste' into 'develop'
...
Fix bad link in likes collection
See merge request pleroma/pleroma!679
6 years ago
sxsdv1
948fba6f76
Fix bad link in likes collection
...
Don't copy and paste, mkay
6 years ago
rinpatch
a95d5da607
Don't show content if empty or zero width space
6 years ago
Ivan Tashkinov
954dc4a4ad
[ #502 ] Fixed `user_count` in `/api/v1/instance` to include only active local users.
6 years ago
Mark Felder
849c83ed46
formatting
6 years ago
Mark Felder
6bc9a641ba
Default to disabled in the code in case the setting is absent from config.exs
6 years ago
rinpatch
388ceb6a7d
Fix the issue with get_by_nickname never being called
6 years ago
Mark Felder
8c368d42a2
Make attachment links configurable
...
Thanks @href!
6 years ago
Ivan Tashkinov
2bfae25a1f
[ #491 ] Made user bio preserve full nicknames (nick@host).
6 years ago
rinpatch
4d5f15cd42
Introduce optional unfurling of nsfw content
6 years ago
rinpatch
0256bd2f1d
Use object url instead of a hack
6 years ago
rinpatch
fd3a558230
Apply feld's patch
6 years ago
rinpatch
5fa508cc2b
Remove @providers and call Pleroma.config on runtime
6 years ago
rinpatch
bb43f4cee9
Remove useless with in opengraph.ex
6 years ago
rinpatch
9a90b5d91a
oof
6 years ago
rinpatch
8a9f089812
remove id cast
6 years ago
rinpatch
5a08dee379
cache ap_id in id instead of caching user two times
6 years ago
rinpatch
82cf9b9751
forgot to remove this thing
6 years ago
rinpatch
293f6a8b71
join us now and share the software~. Also tests
6 years ago
lain
943324b661
MastoAPI: Don't break on missing users.
6 years ago
rinpatch
b44995866b
Replace map with reduce to remove nils
6 years ago
lambda
608cc65d43
Merge branch 'feature/improve-microformats' into 'develop'
...
improve microformats support
See merge request pleroma/pleroma!672
6 years ago
lambda
da4b670451
Merge branch '518_instance_stats_fix' into 'develop'
...
[#518 ] Fix: /api/v1/instance ("domain_count"), /api/v1/instance/peers
Closes #518
See merge request pleroma/pleroma!673
6 years ago
rinpatch
ff01fd3c4f
Remove caching because it does not affect performance and may be even worse in some cases
6 years ago
Ivan Tashkinov
90433b988e
[ #518 ] Fixed /api/v1/instance ("domain_count" value) and /api/v1/instance/peers responses.
6 years ago
rinpatch
bfe2a11a6b
Add config doc
6 years ago
Ivan Tashkinov
0bc6d30f7d
[ #477 ] Minor refactoring (user search query).
6 years ago
rinpatch
a9c27e137d
Add a fallback function to handle generic params, just in case
6 years ago
rinpatch
a76793006b
Thanks you rinpatch, very cool
6 years ago
rinpatch
0039d45b5b
No need to use activity in the key
6 years ago
rinpatch
70b2bb6ede
add caching
6 years ago
rinpatch
dd1432d695
Disable previews for any activity, but create
6 years ago
William Pitcock
461ab9489d
formatter: improve microformats markup
6 years ago
William Pitcock
1ddab78247
html: allow microformats-related markup through the html filter
6 years ago
rinpatch
565caff3f4
cache HTML in OGP
6 years ago
rinpatch
9aa69e12b8
Add behaviours to TwitterCard, remove some dumb stuff in Formatter.truncate
6 years ago
lambda
9a444c0d22
Merge branch 'bugfix/websub-hardening' into 'develop'
...
websub: improve error handling
See merge request pleroma/pleroma!670
6 years ago
rinpatch
2e630bea0d
Add twitter card, filter nsfw
6 years ago
William Pitcock
2d3241753f
http: add support for query parameters, use Jason for JSON encoding instead of Poison like everywhere else
6 years ago
rinpatch
70f140681f
Add space between name and nickname
6 years ago
rinpatch
e8eecd61b4
Formating
6 years ago
rinpatch
410fd9d774
Attach attachments
6 years ago
William Pitcock
17da432dbb
websub: improve error handling
6 years ago
rinpatch
ff6c9a5c96
Introduce get_by_id in Activity, replace newlines with spaces
6 years ago
rinpatch
850912b06b
refactor opengraph to a different module with a behaviour
6 years ago
rinpatch
8745c8c990
remove useless newlines after every tag. Make domain.com/username provide opengraph too
6 years ago
Ivan Tashkinov
5b8f9ff8c1
[ #477 ] User search tests. Normalized search rank in User.search.
6 years ago
rinpatch
2858fd2da2
add a fallback function
6 years ago
rinpatch
6f23139864
please don't bully me for this
6 years ago
rinpatch
4587a5712a
cringe
6 years ago
rinpatch
ce15e0659e
Fix some edge cases [nervous laughter]
6 years ago
lambda
646bb87816
Merge branch 'fix/elixir-1-8-type-annotation' into 'develop'
...
Fix Elixir 1.8 type annotation issue
Closes #523
See merge request pleroma/pleroma!668
6 years ago
rinpatch
4656f433f9
Move metadata.ex out of ostatus
6 years ago
Haelwenn (lanodan) Monnier
9fcdca1bdc
Upload: Fix uploading with a : in the filename
6 years ago
Haelwenn (lanodan) Monnier
e3eb75bd23
Upload: Fix uploading with a ? in the filename
6 years ago
Maxim Filippov
e8eff9fe03
Fix Elixir 1.8 type annotation issue
6 years ago
rinpatch
f20bfc9ea5
Merge branch 'media-url-escape' into 'develop'
...
URI escape file upload URLs
See merge request pleroma/pleroma!665
6 years ago
lambda
fd2f1258fb
Merge branch 'load-all-dms' into 'develop'
...
Remove recent activity restriction.
See merge request pleroma/pleroma!644
6 years ago
Ivan Tashkinov
dc45ec62c2
[ #477 ] User search improvements: tsquery search with field weights, friends & followers boosting.
6 years ago
Shadowfacts
42b7584068
URI escape file upload URLs
6 years ago
kaniini
de1da7b3d1
Merge branch 'feature/add-oembed-parser' into 'develop'
...
Add OEmbed parser
See merge request pleroma/pleroma!661
6 years ago
kaniini
fa0392e49c
Merge branch 'activitypub-likes' into 'develop'
...
Activitypub c2s likes
See merge request pleroma/pleroma!658
6 years ago
rinpatch
5f9786288d
Prefer ids to usernames
6 years ago
William Pitcock
6e5b0406b9
mrf: add no placeholder-text policy, strips pointless "." content from posts with images
6 years ago
rinpatch
e4dc3f71ae
Resolve merge conflict
6 years ago
Maxim Filippov
b8a77c5d70
Add OEmbed parser
6 years ago
sxsdv1
868034375c
Add likes to activitypub object representation
...
Top level of the likes OrderedCollection is inlined to get immediate
access to totalItems. Because the count can be returned without scanning
the database for like activities the extra query is saved when the
client only wants to display the total.
6 years ago
sxsdv1
581edd5a91
Add route to get object like activities
6 years ago
sxsdv1
36711e1c83
Handle client submitted activitypub like activity
6 years ago
sxsdv1
1eb7318831
Prepare all types objects before serialising
...
Activities returned from inbox can include other types of objects like
Article
6 years ago
Sadposter
9daf162461
Honour parameters on MastoAPI /favourites
6 years ago
Sadposter
144b48da95
Add link headers to MastoAPI /favourites
...
As documented at https://docs.joinmastodon.org/api/rest/favourites/
6 years ago
Egor Kislitsyn
b594a54d0c
unpin when deleting a status
6 years ago
kaniini
e4afe1359b
Merge branch 'activitypub-dereference-activity-id' into 'develop'
...
Support activity+json request for activity
See merge request pleroma/pleroma!641
6 years ago
Maxim Filippov
1f851a0723
Add Twitter Card parser
6 years ago
kaniini
11d08c6226
Merge branch 'twapi-follower-pagination' into 'develop'
...
Twapi follower pagination
See merge request pleroma/pleroma!648
6 years ago
Haelwenn
ab4c5f5bf7
Merge branch 'bugfix/markdown-newline-codeblocks' into 'develop'
...
common api: fix newlines in markdown code blocks
See merge request pleroma/pleroma!651
6 years ago
William Pitcock
0bdbd4f968
common api: utils: remove newline to <br> conversion from bare HTML to be consistent with markdown
...
ok @lanodan
6 years ago
William Pitcock
2ecf81f10c
common api: fix newlines in markdown code blocks
6 years ago
kaniini
7f5efddd6e
Merge branch 'feature/pinned-posts' into 'develop'
...
Pinned Statuses
Closes #440
See merge request pleroma/pleroma!636
6 years ago
kaniini
f85d108c41
Merge branch 'mass-follow' into 'develop'
...
Mass follow
See merge request pleroma/pleroma!642
6 years ago
kaniini
d203b0b4d3
Merge branch 'dm-optimizations' into 'develop'
...
Add activity visibility index.
See merge request pleroma/pleroma!646
6 years ago
rinpatch
b57db828c7
Merge branch 'hotfix/ogp-cachex-fix' into 'develop'
...
Rich media: Remove :commit since a tuple is already returned
See merge request pleroma/pleroma!649
6 years ago
rinpatch
a2d7f0e0e9
Remove :commit since a tuple is already returned
6 years ago
lain
a99e156f2c
Add integer casts.
6 years ago
lain
7ac152ed38
TwitterAPI: Add follower/following pagination.
6 years ago
lambda
1881680e28
Merge branch 'scarlett/pleroma-summary-html-api' into 'develop'
...
Scarlett/pleroma summary html api
See merge request pleroma/pleroma!647
6 years ago
lain
5027f82cde
Add activity visibility index.
6 years ago
Egor Kislitsyn
44a1e69484
Add Twitter API for the pinned statuses
...
```
# Only return statuses that have been pinned
GET /api/statuses/user_timeline.json?pinned=true
# Pin
POST /api/statuses/pin/:id
# Unpin
POST /api/statuses/unpin/:id
```
6 years ago
lain
9854978b8b
Remove recent activity restriction.
...
This should be fine now, everything should be covered by indices.
6 years ago
Egor Kislitsyn
1b06e6fdf3
only non-reblogs, self-authored, public statuses can be pinned
6 years ago
lain
65fc2df7cc
Use follow_all in autofollow.
6 years ago
lain
26938d65fd
Add User mass following function.
6 years ago
Egor Kislitsyn
48591aab98
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/pinned-posts
...
# Conflicts:
# docs/config.md
6 years ago
sxsdv1
20c0dd1e24
Support activity+json request for activity
6 years ago
kaniini
5c5c8508c2
Merge branch 'hotfix/media-proxy-uri' into 'develop'
...
user: fix local vs remote determination in remote_or_auth_active?/1
See merge request pleroma/pleroma!640
6 years ago
William Pitcock
f15183178c
user: fix auth_active?/1 for remote users
6 years ago
William Pitcock
0015d43e13
user: factor out illogical User.Info.superuser?/1.
...
any actual callee will be dealing with a User struct to begin with, so
just check the child struct inside User.superuser?/1 with pattern matching.
6 years ago
William Pitcock
74f48beec3
user: remove entirely redundant remote_or_auth_active?/1.
...
auth_active?/1 can check remote users and return true directly.
6 years ago
William Pitcock
2af67353c5
user: harden auth_active?/1, superuser?/1, visible_for?/1
6 years ago
William Pitcock
595a970493
user: use pattern matching to determine if user is local or remote instead of the previous hairy logic
6 years ago
Egor Kislitsyn
0c750bc432
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/pinned-posts
6 years ago
lain
0fae04c4e3
Add a setting for users to autofollow on sign up.
6 years ago
Egor Kislitsyn
e679da4c34
add `pinned` property to `StatusView`
6 years ago
Egor Kislitsyn
63dbd87568
rename `post` to `status`
6 years ago
lain
a16b17cc61
Actually put some onformation in the error user, make it actually properly parse
...
in conversations.
6 years ago
kaniini
74e1093732
Merge branch 'resilient-user-view' into 'develop'
...
Make TwAPI UserView more resilient to issues.
See merge request pleroma/pleroma!634
6 years ago
Egor Kislitsyn
f24087f96e
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/pinned-posts
6 years ago
Egor Kislitsyn
380e9fba21
add pinned posts
6 years ago
lain
7382adf407
Make TwAPI UserView more resilient to issues.
...
Will work for missing users and badly migrated users.
6 years ago
scarlett
36fa5e8802
Check visible_for_user when performing a search using a direct link.
6 years ago
scarlett
52493467ac
Twitter API: Add a summary_html field.
...
The intention here is to allow proper subject copying when it contains
emoji, obviously this will require minor frontend changes, though.
6 years ago
Sadposter
042852ecf3
Add check to prevent multiple follow notifications from the same user
6 years ago
kaniini
8d047c7a72
Merge branch 'fix/user-search-null-name' into 'develop'
...
fix user search results for users with unset display name
Closes #499
See merge request pleroma/pleroma!625
6 years ago
kaniini
576368237c
Merge branch 'activitypub-tombstone-fix' into 'develop'
...
Don't crash on AP request for tombstone
See merge request pleroma/pleroma!630
6 years ago
scarlett
145d6fe6e9
Merge branch 'emoji-in-summary' into 'develop'
...
Strip HTML in and allow emoji in summaries.
See merge request pleroma/pleroma!631
6 years ago
scarlett
6556be344d
Resolve some test failures.
6 years ago
scarlett
3c86d907d4
add some brakets to the emoji list.
6 years ago
scarlett
0787f0dfbe
Strip HTML in and allow emoji in summaries.
6 years ago
sxsdv1
2d7da5f437
Don't crash on AP request for tombstone
...
Because tombstone objects has no addressing the is_public?-predicate
would cause an error that propagated as a 500 error in the api
6 years ago
cascode
a81307251c
Merge branch 'develop' of git.pleroma.social:cascode/pleroma into fix/user-search-null-name
6 years ago
rinpatch
ba17518a0a
Merge branch 'feature/rich-media-cachex' into 'develop'
...
rich media: use cachex to avoid flooding remote servers
See merge request pleroma/pleroma!629
6 years ago
William Pitcock
487c00d36d
rich media: disable cachex in test mode
6 years ago
kaniini
bf5aaefbb5
Merge branch 'fix/html-cache-content-collision' into 'develop'
...
Different caches based on the module. Remove scrubber version since it is not relevant anymore
See merge request pleroma/pleroma!628
6 years ago
William Pitcock
0964c207eb
rich media: use cachex to avoid flooding remote servers
6 years ago
Rin Toshaka
1e2d58982e
oopsies
6 years ago
Rin Toshaka
846082e54f
Different caches based on the module. Remove scrubber version since it is not relevant anymore
6 years ago
kaniini
4258dd8633
Merge branch 'feature/rich-media' into 'develop'
...
URL previews in posts
Closes #402
See merge request pleroma/pleroma!617
6 years ago
kaniini
ffea81b84f
Merge branch 'activitypub-c2s-delete-activity' into 'develop'
...
Activitypub c2s delete activity
See merge request pleroma/pleroma!618
6 years ago
Wim Vanderbauwhede
ba93396649
Patch to support image descriptions in Pleroma FE
6 years ago
Wim Vanderbauwhede
4c95545d19
Patch to support image descriptions in Pleroma FE
6 years ago
Wim Vanderbauwhede
fe2dceb66d
Patch to support image descriptions in Pleroma FE
6 years ago
cascode
5b23dfa1c5
handle null
6 years ago
kaniini
d9d62a110c
Merge branch 'mr/retry-queue-remove-fold' into 'develop'
...
rewrites List.foldl to Enum.each in RetryQueue
See merge request pleroma/pleroma!621
6 years ago
kaniini
eaaf701319
Merge branch 'fix/follow-requests-deleted-accounts' into 'develop'
...
user: check that the follow request actually has an active account associated with it
See merge request pleroma/pleroma!623
6 years ago
rinpatch
b73a1a33de
Merge branch 'captcha' into 'develop'
...
Make captcha (kocaptcha) stateless
See merge request pleroma/pleroma!585
6 years ago
William Pitcock
eb1a18d22f
user: check that the follow request actually has an active account associated with it
...
because of user refetch, accounts can stop existing (get_from_ap_id() can fail), accordingly
filter the follow requests for these failures.
6 years ago
Michael Loftis
943211b035
rewrites List.foldl to Enum.each
6 years ago
Maxim Filippov
48e81d3d40
Add RichMediaController and tests
6 years ago
sxsdv1
4e1cc2bab6
Implement delete activity
6 years ago
sxsdv1
551c3d9391
Split create activity specifics from update_outbox
6 years ago
Maxim Filippov
917d48d09b
Better variable name
6 years ago
Maxim Filippov
2aab4e03c3
Add OGP parser
6 years ago
kaniini
32bed66471
Merge branch 'pool-usage' into 'develop'
...
Update of hackney and tesla, removal of superflous default options.
See merge request pleroma/pleroma!614
6 years ago
rinpatch
34fa709015
Merge branch 'configurable-federator' into 'develop'
...
Make Federator options configurable.
See merge request pleroma/pleroma!615
6 years ago
lambda
32541172cd
Merge branch 'cleanup/admin-api-useless-if' into 'develop'
...
Web.AdminAPI.AdminAPIController: Remove a useless if in user_delete
See merge request pleroma/pleroma!612
6 years ago
lain
400337b0a7
Make Federator options configurable.
6 years ago
lain
096a927805
Merge remote-tracking branch 'origin/develop' into pool-usage
6 years ago
lain
d4799e0dc2
Remove default pool, it's used automatically anyway.
6 years ago
Haelwenn (lanodan) Monnier
1e6c102bfc
Web.AdminAPI.AdminAPIController: Remove a useless if in user_delete
6 years ago
kaniini
90e157ef80
Merge branch 'features/admin-api-user-views' into 'develop'
...
User/Account views: Add rights.admin
Closes #472
See merge request pleroma/pleroma!589
6 years ago
William Pitcock
980b5288ed
update copyright years to 2019
6 years ago
lambda
33e3a7ba7d
Merge branch 'fix/scrubber-cache' into 'develop'
...
[#481 ] Store scrubbed posts in Cachex
Closes #481
See merge request pleroma/pleroma!610
6 years ago
Rin Toshaka
6ed9b31a5f
Eh?
6 years ago
Rin Toshaka
7e09c2bd7d
Move scrubber cache-related functions to Pleroma.HTML
6 years ago
kaniini
8e7da98b18
Merge branch 'mr/retry-queue' into 'develop'
...
Improves RetryQueue behavior
See merge request pleroma/pleroma!609
6 years ago
Rin Toshaka
dec23500d8
Resolve merge conflict
6 years ago
Rin Toshaka
ab3089d6a7
Fix comment in object.ex
6 years ago
Rin Toshaka
c50353e6ae
shame on me for not testing after revert
6 years ago
Rin Toshaka
3f9da55adc
Fix formating. Aparently my pre-commit hook broke.
6 years ago
Rin Toshaka
62af23bd26
Revert some changes in html.ex
6 years ago
Rin Toshaka
c119ea3a57
Friendship ended with Postgresql now Cachex is my best friend
6 years ago
Rin Toshaka
535fddd286
Friendship ended with Postgresql now Cachex is my best friend
6 years ago
Rin Toshaka
d9f40b05b3
Added get_stripped_html_for_object. Renamed a few things
6 years ago
Michael Loftis
cb286fdeba
Improves RetryQueue behavior
...
reduces to one single timer firing once a second
switches to a parallel worker model
6 years ago
Rin Toshaka
bce152aba0
Tidy up the code. Rename key to signature
6 years ago
Rin Toshaka
66d1c31461
Fix some stupid typos
6 years ago
sxsdv1
f40562b4e1
Respond with full activity to outbox post
6 years ago
sxsdv1
1e781715c8
Limit activity types accepted to outbox to only 'Create'
6 years ago
sxsdv1
569bad8210
Create activity when client posts to outbox
6 years ago
sxsdv1
26dc2dddab
Implement ActivityPub inbox view
...
More or less verbatim copied from the outbox template with only changes
to the activities fetched and url reported
6 years ago
Rin Toshaka
a32e23905a
Use Object.change instead of Ecto.Changeset.change
6 years ago
sxsdv1
aa082ca7b6
Wire up stub routes for client calls of activitypub inbox/outbox
...
Code style: remove wrapping function of outbox
6 years ago
Rin Toshaka
9a0163db53
use Kernel.put_in instead of Map.merge
6 years ago
vaartis
816db3f494
Remove the debugging IO.inspect
6 years ago
Rin Toshaka
19f9889fbe
I am not sure what's going on anymore so I'll just commit and reset all the other files to HEAD
6 years ago
kaniini
3dc5f04976
Merge branch 'carrot-bullying' into 'develop'
...
Add some hard limits on inserted activities.
See merge request pleroma/pleroma!595
6 years ago
kaniini
dd8f2196f6
Merge branch '483_blocks_import_export' into 'develop'
...
[#483 ] Blocked users list import & export
Closes #483
See merge request pleroma/pleroma!603
6 years ago
Maksim Pechnikov
523848d1fd
Salmon# fixed publish an activity to remote accounts
6 years ago
Ivan Tashkinov
7bd49a3222
[ #483 ] User.get_by_nickname/1: ensured case-insensitive matching for local FQN. Added tests.
6 years ago
Ivan Tashkinov
b3574dccbb
[ #483 ] User.get_by_nickname/1: allowed retrieving user by fully-qualified local nickname
...
(<nick>@<our_instance_host>).
6 years ago
Ivan Tashkinov
67b4297f4d
[ #483 ] Refactored blocks and follows import, added tests.
6 years ago
kaniini
49cf5f9ce0
Merge branch '471_invalid_accounts_rendering' into 'develop'
...
[#471 ] Prevented rendering of inactive local accounts
Closes #471
See merge request pleroma/pleroma!599
6 years ago
Ivan Tashkinov
700661b761
[ #483 ] Blocked users list import (TwitterAPI).
6 years ago
Ivan Tashkinov
0a41786624
[ #467 ] Refactored valid / invalid user rendering.
6 years ago
kaniini
68f483ef4c
Merge branch 'fix/no-attachment-links' into 'develop'
...
Treat any present value in "no_attachment_links" as true
Closes pleroma-fe#175
See merge request pleroma/pleroma!597
6 years ago
Ivan Tashkinov
6e9a15b181
[ #483 ] Blocked users export for TwitterAPI.
6 years ago
Haelwenn (lanodan) Monnier
b43d630f30
Web.TwitterAPI.UserView: Add rights.admin
6 years ago
Ivan Tashkinov
0d1788ce44
[ #471 ] Factored out User.visible_for?/2.
6 years ago
Vyr Cossont
d8cc96cb1f
Fix Twitter timelines for private instances
6 years ago
kaniini
bee6acd51d
Merge branch 'feature/create-tombstone-instead-of-delete' into 'develop'
...
Create tombstone instead of object deletion
See merge request pleroma/pleroma!593
6 years ago
kaniini
cff0292d4b
Merge branch 'reserve-user-names' into 'develop'
...
Reserve a few user names
See merge request pleroma/pleroma!594
6 years ago
Ivan Tashkinov
e6aeb1d4a5
[ #471 ] Prevented rendering of inactive local accounts.
6 years ago
Maxim Filippov
be70272ab0
Treat only true and "true" as true
6 years ago
vaartis
708a228919
Set ttl_interval to the seconds_valid time
6 years ago
Vyr Cossont
e4562105e7
Implement exclude_reblogs and include_rts
6 years ago
Maxim Filippov
838c024231
Treat any present value in "no_attachment_links" as true
6 years ago
Ekaterina Vaartis
448af3601a
Up captcha timer to 60 secs again, save used captchas in cachex
6 years ago
lain
551d80cc01
Expose restricted names in nodeinfo.
6 years ago
lain
5811e65e67
Add some hard limits on inserted activities.
6 years ago
lain
91724d160a
Reserve a few user names
...
These are all names that are used for domain.com/:route routes or projected to be.
6 years ago
Maxim Filippov
ca2e9ce9cc
Revert unneeded changes
6 years ago
Maxim Filippov
f75f707f6c
Revert Activity tombstones, add ObjectTombstone struct
6 years ago
Maxim Filippov
2bbec33c71
Fix failing tests
6 years ago
Maxim Filippov
18a4cbb244
Capitalize "tombstone"
6 years ago
Maxim Filippov
0f412cf6e6
Create tombstone instead of object deletion
6 years ago
William Pitcock
2791ce9a1f
add license boilerplate to pleroma core
6 years ago
lambda
005b4194ff
Merge branch 'bugfix/trans_fix_url_videos' into 'develop'
...
Fix "url" of Videos in transmogrifier
Closes #367
See merge request pleroma/pleroma!459
6 years ago
William Pitcock
34a4ed22c4
twitter api: add "Video" to supported activity types list
6 years ago
William Pitcock
79b51a97fe
twitter api: activity representer: remove peertube hack
6 years ago
William Pitcock
32dfc1d12a
mastodon api: status view: remove obsolete peertube hack
6 years ago
William Pitcock
71f6d9f418
transmogrifier: significantly rework handling of peertube videos, add test
6 years ago
lambda
a3e33fa177
Merge branch 'hotfix/activity-without-content' into 'develop'
...
Twitter ActivityView: fix crash with activity without content
See merge request pleroma/pleroma!572
6 years ago
Haelwenn (lanodan) Monnier
3aff8067e4
transmogrifier: When it’s a Video move "url" to "attachment"
6 years ago
Karen Konou
a7f07bb6e5
Implement kaniini's tweaks
6 years ago
Karen Konou
c76179419d
Renamed the things
6 years ago
Karen Konou
409ff60bf8
Fix formatting
6 years ago
Karen Konou
92362e1e22
Implement large thread filter
6 years ago
Ekaterina Vaartis
b386e560ba
Move the encryption out of kocaptcha into general captcha module
...
That way there won't be a need to reimplement it for other captcha services
6 years ago
Ekaterina Vaartis
336e37d98f
Make captcha (kocaptcha) stateless
...
Also rename seconds_retained to seconds_valid since that's how it is
now. Put it down from 180 to 20 seconds. The answer data is now
stored in an encrypted text transfered to the client and back, so no
ETS is needed
6 years ago
kaniini
2e2030ada8
Merge branch '114_email_confirmation' into 'develop'
...
[#114 ] Email confirmation
See merge request pleroma/pleroma!546
6 years ago
Ivan Tashkinov
7cab7de9ff
[ #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.
6 years ago
Ivan Tashkinov
f69cbf4755
[ #114 ] Added :user_id component to email confirmation path to improve the security.
...
Added tests for `confirm_email` action.
6 years ago
Ivan Tashkinov
8adcd1e80f
[ #114 ] Removed flash messages rendering on redirects.
6 years ago
Ivan Tashkinov
501ce34d7f
[ #114 ] Stylistic adjustments.
6 years ago
Maksim
f1b93b5be7
[ #413 ] fix parse mentions
6 years ago
kaniini
fda148a9a2
Merge branch 'documentation/copy-pleroma-api' into 'develop'
...
Pleroma-API.md: Import from /wikis/Pleroma-only-api-endpoints
See merge request pleroma/pleroma!571
6 years ago
raeno
652f49d176
Remove extra bracket
6 years ago
raeno
7fb3780431
Merge branch 'develop' into oembed_provider
6 years ago
Ivan Tashkinov
b520d44b58
[ #114 ] `mix format`
6 years ago
Ivan Tashkinov
279096228c
[ #114 ] Made MastodonAPI and TwitterAPI user show actions return 404 for auth-inactive users
...
unless requested by admin or moderator.
6 years ago
Ivan Tashkinov
a532ad5d72
[ #114 ] User.register/1 tweak.
6 years ago
Ivan Tashkinov
968d7490b6
[ #114 ] User.Info: renamed `confirmation_update` to `confirmation_changeset`.
6 years ago
Ivan Tashkinov
59fc5d15df
[ #114 ] User.Info: renamed `confirmation_update` to `confirmation_change`.
6 years ago
kaniini
f98ee9402f
Merge branch 'userless-admin' into 'develop'
...
Add a way to use the admin api without a user.
See merge request pleroma/pleroma!576
6 years ago
lain
f3eb414e28
Add a way to use the admin api without a user.
6 years ago
rinpatch
ef318fb8a9
Merge branch 'develop' into fix/formatter-ignore-html-chars
6 years ago
rinpatch
059dd6f681
Ignore HTML characters in formatter.ex
6 years ago
Haelwenn (lanodan) Monnier
a6dfe1fc6b
Documentation: Move generated files to priv/static/doc, add it to endpoint.ex
6 years ago
href
f58f20abbb
Twitter ActivityView: fix crash when activity content is nil
6 years ago
Ivan Tashkinov
3371a45884
[ #114 ] Formatting fix.
6 years ago
Ivan Tashkinov
b096e30cff
[ #114 ] Added email confirmation resend action. Added tests
...
for registration, authentication, email confirmation, confirmation resending.
Made admin methods create confirmed users.
6 years ago
Ivan Tashkinov
aed0f90287
[ #114 ] Added `pleroma.confirmation_pending` to user views, adjusted view tests.
6 years ago
Ivan Tashkinov
b86057cc7f
[ #114 ] Refactored User.register_changeset to init confirmation data.
...
Introduced User.register/1 to encapsulate User record creation and post-registration actions.
6 years ago
Ivan Tashkinov
1de0aa2f10
[ #114 ] Account confirmation email, registration as unconfirmed (config-based), auth prevention for unconfirmed.
6 years ago
Ivan Tashkinov
a05cb10a95
[ #114 ] Email confirmation route, action, node setting, User.Info fields.
6 years ago
raeno
a300336459
Merge branch 'develop' into oembed_provider
6 years ago
href
b1860fe85a
Instance/Static runtime plug
...
This allows to set-up an arbitrary directory which overrides most of the
static files: index.html static/ emoji/ packs/ sounds/ images/ instance/
favicon.png.
If the files are not present in the directory, the bundled ones in
priv/static will be used.
6 years ago
lambda
3d980daa49
Merge branch '459_fix_user_profile_crash' into 'develop'
...
Fix update_profile failing due to OAuth token record in assigns instead of string
Closes #459
See merge request pleroma/pleroma!561
6 years ago
Maksim Pechnikov
92a5133c42
fix text field
6 years ago
lambda
52ac7dce5c
Merge branch 'captcha' into 'develop'
...
Captcha
See merge request pleroma/pleroma!550
6 years ago
lambda
c6d5f189d9
Merge branch 'fix-tags' into 'develop'
...
Fix tagging problems for existing instances.
See merge request pleroma/pleroma!562
6 years ago
lambda
078b8b6d22
Merge branch 'phoenix14' into 'develop'
...
Upgrade to Phoenix 1.4
Closes #451
See merge request pleroma/pleroma!560
6 years ago
lain
e4763cd459
Fix tagging problems for existing instances.
6 years ago
vaartis
35522fef09
Use :ets.match_delete to delete old captchas
6 years ago
href
77b5154c82
Cowboy handler for Mastodon WebSocket
6 years ago
raeno
cc87880488
Support both OAuth token record and token string in UserView
6 years ago
lambda
567359790e
Merge branch 'testfix/webfinger-jrd' into 'develop'
...
WebFinger: Sends a 400 when resource param is missing, fix XRD typo in test
See merge request pleroma/pleroma!554
6 years ago
Ekaterina Vaartis
ef6829382a
Clean captchas up periodically, not schedule it after theyre created
6 years ago
Ekaterina Vaartis
3a31fdaf06
Change minutes_retained config to seconds_retained
6 years ago
Ekaterina Vaartis
6062885df6
Add a configurable auto-cleanup for captchas
6 years ago
href
5dcb7aecea
More put_view.
6 years ago
href
f672555ad3
Upgrade to Phoenix 1.4
6 years ago
eal
28478a9c4f
Merge branch 'fix/masto-put-settings' into 'develop'
...
Mastodon API: Fix PUT /api/web/settings
See merge request pleroma/pleroma!557
6 years ago
eal
4c783e35c0
Mastodon API: Fix PUT /api/web/settings
6 years ago
Ekaterina Vaartis
8d55a549e6
Replace HTTPoison with Tesla for kocaptha
6 years ago
Ekaterina Vaartis
23549d3952
Formatting fixes
6 years ago
Ekaterina Vaartis
b5518da904
Separate captcha implementation into a behaviour and use it
6 years ago
Haelwenn (lanodan) Monnier
cddab5700b
WebFinger: Sends a 400 when resource param is missing, fix XRD typo in test
6 years ago
lambda
cc6689cc20
Merge branch 'fix/views-ignore-unhandled-activites' into 'develop'
...
TwitterAPI.ActivityView: Ignore unhandled activities
See merge request pleroma/pleroma!547
6 years ago
Ekaterina Vaartis
28c43a417e
Add an ability to disabled captcha
6 years ago
Ekaterina Vaartis
a2399c1c7c
Add base CAPTCHA support (currently only kocaptcha)
6 years ago
href
e74f384b68
Merge branch 'fix/issue_433' into 'develop'
...
[#433 ] fix markdown formatting
See merge request pleroma/pleroma!545
6 years ago
href
bfe27c1b55
Merge branch '114_email_invites' into 'develop'
...
[#114 ] Email invites
See merge request pleroma/pleroma!541
6 years ago
href
acec11626d
Merge branch 'fix/issue_272' into 'develop'
...
[#272 ] fix tags
See merge request pleroma/pleroma!540
6 years ago
Maksim Pechnikov
ea72ac549b
fix case when tags is invalid
6 years ago
raeno
b0c3211984
Scrub html from activity.content or user.bio for opengraph meta
6 years ago
raeno
90b00701ff
Merge branch 'develop' into oembed_provider
6 years ago
Maksim Pechnikov
d3ec09bb38
fix tags
6 years ago
raeno
46486595ff
Handle "users/:id" links as well. Fix comments in MR.
6 years ago
href
980131b4db
Merge branch 'pleroma-feature/compat/push-subscriptions' into 'develop'
...
Improve web push
Closes #393 , #422 , and #452
See merge request pleroma/pleroma!524
6 years ago
Maksim Pechnikov
bc6262d250
fixed typo
6 years ago
href
84b9a9d497
TwitterAPI.ActivityView: Ignore unhandled activities
6 years ago
href
412df2cd38
Warn if push is disabled..
6 years ago
Maksim Pechnikov
baead4ea4b
fix markdown formatting
6 years ago
href
91236c60c7
Merge branch 'feature/file-size-checking' into 'develop'
...
[#36 ] Add warnings when file upload fails
See merge request pleroma/pleroma!523
6 years ago
href
0b4c61e8d5
Fix warning
6 years ago
href
ec0e613eca
Pleroma.Activity.mastodon_notification_type/1
6 years ago
href
331396cbcd
Properly disable Web Push if no VAPID key is set
6 years ago
href
6822916183
Typos
6 years ago
href
b1bcd97a0f
Push: respect alerts settings
6 years ago
href
d8984b7bf8
Push: add missing notification_type field
6 years ago
href
7facbb2b8d
Push.Subscription: convert base64 to base64 urlsafe
6 years ago
Egor Kislitsyn
324933a0ac
improve push message format (compatibility with mastodon)
6 years ago
Egor Kislitsyn
658edb166f
fix and improve web push; add configuration docs
6 years ago
Ivan Tashkinov
69fd63e248
[ #114 ] Added `invitesEnabled` to `metadata` of nodeinfo.
6 years ago
Ivan Tashkinov
66380b0641
[ #114 ] Removed `confirm_email` action stub (to be addressed in a separate MR).
6 years ago
Ivan Tashkinov
07e93f9940
[ #114 ] Improved tests.
6 years ago
Ivan Tashkinov
9666376f5f
[ #114 ] Readded `invites_enabled` config setting, updated readme.
6 years ago
Ivan Tashkinov
a89e3b4b60
[ #114 ] Moved email_invite action to AdminAPIController, adjusted tests.
6 years ago
Ivan Tashkinov
3cbf16a5fe
[ #114 ] Added UserInviteToken creation, adjusted invitation email link to include it.
6 years ago
Ivan Tashkinov
cc83d7ffe7
[ #114 ] Naive implementation of email invitations.
6 years ago
href
30dc81667c
Merge branch '114_user_registration_emails' into 'develop'
...
[#114 ] User registration emails
Closes #114
See merge request pleroma/pleroma!531
6 years ago
Ivan Tashkinov
f81213910f
[ #114 ] Addressed MR comments. Removed functionality to be extracted to other MRs.
6 years ago
lambda
262cc6d44b
Merge branch 'fix/double-rt-or-fav' into 'develop'
...
Prevent accidental double RTs or favorites
See merge request pleroma/pleroma!542
6 years ago
eal
61ad2ce422
TwitterAPI: Include favorited post in json
6 years ago
eal
1ca080c862
Prevent accidental double RTs or favorites
6 years ago
raeno
c5c3ad90d0
Fix tests. Remove oembed template
6 years ago
raeno
b5de7c4c4d
Remove oembed for now, will submit it in another MR. Fix warnings
6 years ago
raeno
018516d3f3
Refactor ostatus_controller, extract metatags redirection to Redirector itself. Set 'html' as default type for ostatus links
6 years ago
raeno
9b3a6cdb07
Extract opengraph/oembed into separate module
6 years ago
raeno
d903e34cac
Add opengraph/twitter_card:summary support. Add config to toggle on/off specific metadata
6 years ago
raeno
8902942128
WIP. Implement oembed route and handle both json/xml for "Note" type activity
6 years ago
raeno
21afdf6d99
Insert meta tags into static index.html on the fly for OStatus#notice
6 years ago
Ivan Tashkinov
9e689de063
[ #114 ] Removed `email_invite` implementation (to be addressed separately).
6 years ago
Ivan Tashkinov
18b9467d1a
[ #114 ] Removed `email_invite` implementation (to be addressed separately).
6 years ago
Ivan Tashkinov
00744c6b03
[ #114 ] Initial implementation of user email invitations.
6 years ago
Ivan Tashkinov
908943352f
[ #114 ] Refactored `password_reset` (moved to TwitterAPI). Added homepage links to password reset result pages.
6 years ago
href
7214d57463
Extended nicknames: allow dashes.
6 years ago
href
7d9ddbe689
Allow underscores in usernames.
...
Fixes #429 .
6 years ago
Ivan Tashkinov
bfff2399ff
[ #114 ] Routes and config for `confirm_email` and `email_invite` (Twitter API).
6 years ago
Ivan Tashkinov
e3a21bcd45
[ #114 ] Addressed warnings. Fix of `with` statement clause in `password_reset`.
6 years ago
Ivan Tashkinov
f5afb11032
[ #114 ] Initial implementation of user password reset emails (user-initiated).
6 years ago
Ivan Tashkinov
12905ce1ad
[ #114 ] Added /dev/mailbox dev-only route (emails preview). Added mailer config examples.
6 years ago
Ivan Tashkinov
10c156d98f
[ #114 ] SMTP deps and config.
6 years ago
Maksim Pechnikov
89b3729afa
fix warnings
6 years ago
scarlett
213176c3c3
Add new frontend options to server-side config.
6 years ago
lain
d6bf06ab4f
Fix warnings.
6 years ago
lambda
0863ec2737
Merge branch 'fix_empty_bio_crash' into 'develop'
...
Fixes #415 . Do not crash during registration when hasn't filled bio field
Closes #415
See merge request pleroma/pleroma!529
6 years ago
lambda
ff10b9927b
Merge branch 'support/bugfix_272' into 'develop'
...
[#272 ] fix hashtags in api
See merge request pleroma/pleroma!510
6 years ago
lambda
6786ad3d98
Merge branch 'fix/theora-detection-read-bytes' into 'develop'
...
Fix Theora detection in mime.ex
See merge request pleroma/pleroma!493
6 years ago
lambda
0554d91dcd
Merge branch 'anonymize-filter-text' into 'develop'
...
AnonymizeFilename: allow for a pre-defined text instead of random string
See merge request pleroma/pleroma!516
6 years ago
lain
c81c74d847
Treat warnings as errors outside of tests.
6 years ago
Maksim Pechnikov
e94c3442f4
updates
6 years ago
raeno
9ba4a1c5fe
Fixes #415 . Properly handle nil and empty string by User.parse_bio
6 years ago
Maksim Pechnikov
074fa790ba
fix compile warnings
6 years ago
Maksim Pechnikov
068353ac0b
formatting
6 years ago
Maksim Pechnikov
9442588ae9
fix hashtags in api response
6 years ago
Rin Toshaka
15616eda5e
Make uploadlimit an object that stores upload limits for avatars, banners, backgrounds, general content
6 years ago
lambda
beadeaffa1
Merge branch 'fix/nodeinfo-nil-features' into 'develop'
...
Nodeinfo: remove null features; relay feature.
See merge request pleroma/pleroma!520
6 years ago
href
bdc8112e40
Media proxy: fix url encoding
6 years ago
Rin Toshaka
578051809f
Add uploadlimit to Twitter API config
6 years ago
lambda
7d86c0c53f
Merge branch 'fix/gopher-respect-ip' into 'develop'
...
[#155 ] Fix Gopher server binding only to default value
See merge request pleroma/pleroma!518
6 years ago
lambda
94ac0075bf
Merge branch 'media-proxy-follow-redirect' into 'develop'
...
Media proxy: follow HTTP redirects by default
Closes #421
See merge request pleroma/pleroma!519
6 years ago
href
134cc94cbd
Nodeinfo: remove null features; relay feature.
6 years ago
href
d8fcf7c5cf
Media proxy: follow HTTP redirects by default
6 years ago
lambda
94d8f1ab30
Merge branch '394_user_tags' into 'develop'
...
[#394 ] User tags
Closes #394
See merge request pleroma/pleroma!508
6 years ago
Rin Toshaka
09f20de0d7
Make gopher respect ip
6 years ago
href
3b27f61ffa
AnonymizeFilename: allow for a pre-defined text instead of random string
...
Improve docs
6 years ago
href
3c925e9d88
Emojis: Alphabetical ordering
6 years ago
Ivan Tashkinov
1cea97df64
[ #394 ] Refactoring of User.tag and User.untag (removed User.tag_or_untag etc.)
6 years ago
Ivan Tashkinov
6ed5044c4e
[ #394 ] Refactoring (using Ecto.Multi; "untag" route change).
6 years ago
Ivan Tashkinov
7a2162bbcb
[ #394 ] User view (Twitter & Mastadon API): wrapped "tags" in "pleroma" map.
6 years ago
Ivan Tashkinov
7bcb6a183a
[ #394 ] Refactoring.
6 years ago
Ivan Tashkinov
7b19487389
[ #394 ] Added `users.tags` and admin routes to tag and untag users. Added tests.
6 years ago
kaniini
1d531fd2f3
Merge branch 'fix/mastodon-api-settings' into 'develop'
...
Fix put_settings and remove info_changeset
See merge request pleroma/pleroma!507
6 years ago
kaniini
abead01ab6
Merge branch 'correct-and-improve-http-options' into 'develop'
...
Correct and improve http options
See merge request pleroma/pleroma!505
6 years ago
kaniini
b0adea30b3
Merge branch 're-mrf' into 'develop'
...
Add a MRF Policy for appending re: to identical subjects in replies.
See merge request pleroma/pleroma!499
6 years ago
rinpatch
2ae1128d9f
MastoAPI: Fix put_settings
6 years ago
scarlett
d27e3f269f
Rename regular expression 'have_re' to 'reply_prefix'.
6 years ago
Egor Kislitsyn
6f36e903b0
use `User.avatar_url`
6 years ago
Egor Kislitsyn
79668c08fc
cleanup
6 years ago
scarlett
3dff61ebec
Harden re: detection.
6 years ago
Egor Kislitsyn
3d492795b7
clean up
6 years ago
Egor Kislitsyn
4944498133
Merge branch 'develop' into feature/compat/push-subscriptions
...
# Conflicts:
# lib/pleroma/application.ex
# lib/pleroma/plugs/oauth_plug.ex
6 years ago
Egor Kislitsyn
bac58b1524
show warning if VAPID is not set
6 years ago
Egor Kislitsyn
8b4397c704
Merge branch 'develop' into feature/compat/push-subscriptions
...
# Conflicts:
# lib/mix/tasks/sample_config.eex
# lib/pleroma/web/twitter_api/controllers/util_controller.ex
# mix.exs
# mix.lock
6 years ago
Egor Kislitsyn
04a48286e6
Add web push support
6 years ago
scarlett
6a6aaa0e1a
Use object.normalize.
6 years ago
Hakaba Hitoyo
a09ed0f5af
avoid mix format bug
6 years ago
kaniini
ccf0b46dd6
Merge branch '210_twitter_api_uploads_alt_text' into 'develop'
...
[#210 ] TwitterAPI: alt text support for uploaded images. Mastodon API uploads security fix.
See merge request pleroma/pleroma!496
6 years ago
Ivan Tashkinov
3e90f688f1
[ #210 ] Mastodon: actor storing for media uploads, ownership check to update_media.
...
Refactoring.
6 years ago
Hakaba Hitoyo
96ba95df2e
remove follow_redirect options
6 years ago
Hakaba Hitoyo
27792b2d77
remove pool and timeout options which duplicate with the default
6 years ago
Hakaba Hitoyo
505d820827
Merge remote-tracking branch 'origin/debug-suggestions-api' into correct-and-improve-http-options
6 years ago
kaniini
48a0315646
Merge branch 'follower-hiding' into 'develop'
...
Network hiding
Closes #356
See merge request pleroma/pleroma!490
6 years ago
Vald
194869c7db
added data attrs to twitter scrubber
6 years ago
lain
7d5720f2e4
Fix merge.
6 years ago
lain
76d6b1c6ab
Merge remote-tracking branch 'origin' into follower-hiding
6 years ago
lain
3ea4476445
MastodonAPI: Show users their own network.
6 years ago
lain
fdac215091
TwitterAPI: Show users their own network.
6 years ago
Vald
3ccfe226c0
added data attrs for user and tag
6 years ago
Ivan Tashkinov
3b5be09f45
[ #210 ] Stylistic change.
6 years ago
lain
839526a913
TwitterAPI: Add network hiding.
6 years ago
Ivan Tashkinov
c4f3c5e939
[ #210 ] Stylistic change.
6 years ago
Maksim Pechnikov
c524c50509
fix/273
6 years ago
Ivan Tashkinov
848151f7cb
[ #210 ] [TwitterAPI] Made actor be stored for uploads. Added ownership check
...
to `update_media` action. Added controller tests for `upload` and `update_media` actions.
Refactoring.
6 years ago
Ivan Tashkinov
be187f82f7
[ #210 ] Further refactoring.
6 years ago
hakabahitoyo
a418547bdf
debug /api/v1/suggestions
6 years ago
William Pitcock
956f3c75ca
user: put default user info when registering a user
6 years ago
scarlett
8a1df182cf
Add a MRF Policy for appending re: to identical subjects in replies.
6 years ago
kaniini
ec1ec32f20
Merge branch 'optional-retry-queue' into 'develop'
...
Make retry queue optional.
See merge request pleroma/pleroma!498
6 years ago
lain
925b05054f
Make retry queue optional.
...
At the moment, it can use a lot of memory really fast.
6 years ago
kaniini
114b95cee2
Merge branch 'feature/integration_tesla' into 'develop'
...
[#354 ] Move all http interactions to Tesla
See merge request pleroma/pleroma!487
6 years ago
William Pitcock
b57d83e3c9
MRF: simple policy: fix media removal
6 years ago
Ivan Tashkinov
48e6193bf2
[ #210 ] Refactoring.
6 years ago
Ivan Tashkinov
826fc446d5
[ #210 ] TwitterAPI: implemented /api/media/metadata/create
...
to allow uploads description (alt text) setting.
6 years ago
Maksim Pechnikov
50e72f6c48
remove httpoison_mock
6 years ago
Maksim Pechnikov
dd8aee332c
formatting the code
6 years ago
Maksim Pechnikov
a9e4a97586
update test
6 years ago
Maksim Pechnikov
87109482f3
status_code -> status
6 years ago
Maksim Pechnikov
97252a27d9
fix http request in Salmon
6 years ago
Maksim Pechnikov
ec34de0c1f
WebSub fix test
6 years ago
Maksim Pechnikov
3ce16e5a56
init tesla and updated the http requests in Pleroma.Web.Websub
6 years ago
William Pitcock
d6ab701a14
formatting
6 years ago
William Pitcock
b3b52b58c3
activitypub: transmogrifier: remove obsolete fetch_obj_helper()
6 years ago
William Pitcock
fed9b5404c
object: rework Object.normalize() a bit to support transparent fetching
6 years ago
William Pitcock
02288b5f1c
twitterapi: fix bad rebase
6 years ago
William Pitcock
7a57db0d3a
federator: fix up contain_origin_from_id() call
6 years ago
William Pitcock
f85949cc69
object: factor out fetching functions into Pleroma.Object.Fetcher module
6 years ago
William Pitcock
e8caecb5c7
object: move object containment out of transmogrifier into it's own module
6 years ago
William Pitcock
5d753e1c7c
activity: add helpers for updating activities in the database
6 years ago
William Pitcock
6f90f2c3ac
activitypub: rework thread filtering for split object view
6 years ago
William Pitcock
f168a2add6
ostatus: fix representing external objects
6 years ago
William Pitcock
cf139e3eec
activitypub: transmogrifier: ensure we send nested object in Create
6 years ago
William Pitcock
d6e65f9304
common api: fix up improper Object.normalize() calls
6 years ago
William Pitcock
d13d953385
activitypub: implement activity flattening
6 years ago
William Pitcock
57d90e7afe
activitypub: relay: fix improper use of Object.normalize()
6 years ago
William Pitcock
5ea64f4bf9
activity: minor cleanups to normalization functions to align them with the object normalizers
6 years ago
William Pitcock
5ba5df1321
object: normalize(): use object cache
6 years ago
William Pitcock
e8570758f9
twitterapi: fix remaining test failures
6 years ago
William Pitcock
3b8e5bcbeb
fix most tests
6 years ago
William Pitcock
dd66cc2ca6
ostatus: use Object.normalize() where appropriate when representing activities
6 years ago
William Pitcock
5d4a71906a
mastodon api: use Object.normalize() in a few missing spots
6 years ago
William Pitcock
e9b718cea2
mastodon api: status view: use Object.normalize()
6 years ago
William Pitcock
95a458f392
twitterapi: more object normalization work
6 years ago
William Pitcock
4482ce7e2d
activitypub: normalize objects when streaming them out
6 years ago
William Pitcock
d3fde9b5f2
ostatus: note handler: appropriately use Object.normalize()
6 years ago
William Pitcock
67038ae15e
common api: utils: access inReplyTo object ID correctly
6 years ago
William Pitcock
d6b266163b
common api: fetch visibility from normalized object
6 years ago
William Pitcock
0522b26883
gopher: use Object.normalize()
6 years ago
William Pitcock
663007b42c
activity: clean up direct use of object data
6 years ago
lambda
88b05aeabb
Merge branch 'fix/parse-user-bio' into 'develop'
...
Parse user's bio on register
See merge request pleroma/pleroma!492
6 years ago
lambda
42ef7cd227
Merge branch 'fix-media-proxy-defaults' into 'develop'
...
Fix media proxy config defaults
See merge request pleroma/pleroma!495
6 years ago
Maxim Filippov
4b70e5eae9
Parse bio for MastodonAPI
6 years ago
rinpatch
343b0adfa6
Merge branch 'develop' into fix/theora-detection-read-bytes
6 years ago
rinpatch
a3953ca37a
Change @read_bytes to 35
6 years ago
Maxim Filippov
ce98d5eb9b
Parse user's bio on register
6 years ago
lain
8c9a4e8b40
TwitterAPI: Implement hide_network.
6 years ago
lain
2a639de9b3
MastodonApi: Implement hide_network.
6 years ago
lain
6be0ab1e55
Hide network in ap.
6 years ago
href
43d5e4f7fa
Fix media proxy config defaults
6 years ago
lain
91065e1968
Fix background updating / handling.
6 years ago
lain
f18b86fd5f
More fixes for Info schema.
6 years ago
lain
93f2dc19d9
TwitterAPI: Fix banner and background update.
6 years ago
lain
347df6421d
Fix masto api user updating.
6 years ago
lain
c443c9bd72
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into validate-user-info
6 years ago
lain
1c67277c80
Fix admin api.
6 years ago
href
e9982c521b
Upload filter: anonymize filename
...
It replaces the original filename with a randomly generated string.
6 years ago
kaniini
ca24ad2a2b
Merge branch 'feature/reverse-proxy' into 'develop'
...
reverse proxy / uploads
See merge request pleroma/pleroma!470
6 years ago
href
8e0e20631c
Reverse proxy: default max read duration at 30 secs.
6 years ago
lambda
e99bab8f27
Merge branch 'config-delete' into 'develop'
...
Add Pleroma.Config.delete/1
See merge request pleroma/pleroma!484
6 years ago
href
1d94c8f0f0
Fix supervisor order
...
This starts `Pleroma.Web.Endpoint` after all other processes and may
avoid some weird bugs (especially at start/restart).
Also properly ignores starting the gopher's gen_server if disabled.
6 years ago
href
253da275bd
Pleroma.Config.delete/1
6 years ago
href
7282937f33
MIME: video/audio ogg detection
6 years ago
href
680716b3c9
Config docs
6 years ago
href
65e7307d68
Upload: bring back base_url
6 years ago
href
5d92431350
Fix deprecation warnings
6 years ago
href
02d3dc6869
Uploads fun, part. 2
6 years ago
href
97b00d366f
reverse_proxy: more headers
6 years ago
href
a2640c8088
Parse correctly content-type & do not forward content-length
6 years ago
href
b19597f602
reverse proxy / uploads
6 years ago
lain
d0ec2812bd
Merge remote-tracking branch 'origin' into validate-user-info
6 years ago
lain
8f1fffebc6
Fix transmogrifier test.
6 years ago
lain
d088ac6286
Fix OStatus user updates.
...
Breaks banner updating.
6 years ago
lain
48b95a9b95
Assorted fixes.
6 years ago
lain
d407f662af
Fix TwitterApiController.
6 years ago
lain
a6812bc9df
Remove "most recent notification" endpoint.
6 years ago
KokaKiwi
87098d1676
Streamer: Don't send unwanted DMs to list streams
6 years ago
lain
e002858071
Fix ostatus test.
6 years ago
lain
3c61df6b9e
Webfinger fixes.
6 years ago
lain
badbe2656c
More fixes.
6 years ago
kaniini
b9bc83097d
Merge branch 'ogg-theora-detection' into 'develop'
...
Add Theora detection to upload.ex
See merge request pleroma/pleroma!479
6 years ago
lain
ec464ef20a
HTTP sig fixes.
6 years ago
rinpatch
0d229613df
Fix lint error
6 years ago
rinpatch
7f20a3cf1f
Add Theora detection to upload.ex
6 years ago
Haelwenn
5ae6088d37
Merge branch 'feature/mrf-user-allowlist' into 'develop'
...
MRF: user allowlist module
See merge request pleroma/pleroma!477
6 years ago
kaniini
a76058fc1d
Merge branch 'fix/pleromafe-title' into 'develop'
...
Replace hardcoded <title>
See merge request pleroma/pleroma!476
6 years ago
William Pitcock
271f9f1335
nodeinfo: add mrf_user_allowlist data
6 years ago
William Pitcock
8c05d19c7f
MRF: add user allowlist module
6 years ago
Mark Felder
6cc94404d7
Replace this hardcoded <title>
6 years ago
Haelwenn (lanodan) Monnier
04daa0fa44
Plugs.HTTPSecurityPlug: Activate upgrade-insecure-requests only when there is https
...
This fixes running mastofe with MIX_ENV=dev
6 years ago
shibayashi
591b11eafc
Add manifest-src to allow manifest.json
6 years ago
Haelwenn (lanodan) Monnier
ca029f0b69
Web.Streamer: Get unauthenticated statuses representation
6 years ago
Haelwenn (lanodan) Monnier
d388a99143
Web.MastodonAPI.MastodonSocket: Put access_token at function-level
6 years ago
Haelwenn (lanodan) Monnier
5346fabf14
Web.MastodonAPI.MastodonSocket: Add unauthentified websocket endpoints
...
reported by soka on CRTNet
6 years ago
kaniini
675653ceb7
Merge branch 'feature/admin-api' into 'develop'
...
Add a admin API
See merge request pleroma/pleroma!366
6 years ago
kaniini
182e3e8da2
Merge branch 'feature/improve-version' into 'develop'
...
Improved version string
See merge request pleroma/pleroma!467
6 years ago
kaniini
a591a044a9
Merge branch 'runtime-fixes' into 'develop'
...
Various runtime configuration fixes
See merge request pleroma/pleroma!468
6 years ago
lain
0bea0308f1
Merge branch 'validate-user-info' of git.pleroma.social:pleroma/pleroma into validate-user-info
6 years ago
lain
d3180e0ccc
Raise on usage of old function.
6 years ago
lain
0896cf4c0f
Fix most mastodon api bugs.
6 years ago
Haelwenn
c7d08bc1cf
Merge branch 'feature/retry-queue' into 'develop'
...
Federator: add retry queue.
See merge request pleroma/pleroma!323
6 years ago
William Pitcock
3456948cd1
mastodon api: fix up quite a few test failures
6 years ago
William Pitcock
ef6c64a5d2
activitypub: fix restrict_blocked()
6 years ago
William Pitcock
c196754b4d
mastodon api: account view: fix tests
6 years ago
William Pitcock
ece8656733
streamer: fix fetching the user's block list
6 years ago
William Pitcock
3356c7d1e9
oauth plug: fix deactivated check
6 years ago
William Pitcock
4ac849cb4a
common api: fix moderator check when deleting posts
6 years ago
William Pitcock
312676f711
user: fix user.info lookup in User.locked?()
6 years ago
lain
6f0b9a5163
Fix Notification tests.
6 years ago
lain
2887f4ff1d
Fix formatter tests.
6 years ago
href
bc5cf2c192
Improved version string
6 years ago
href
7f4c3a1e99
mediaproxy: fix empty url & add some tests
6 years ago
eal
689b46efc8
RetryQueue: tiny refractor, add tests
6 years ago
href
bcecdc3ab1
Various runtime configuration fixes
6 years ago
lain
fbb70d25fe
Several twitter api fixes.
6 years ago
lain
40d9d2098c
Fix user updating from AP.
6 years ago
lain
cafa15131a
Mix format.
6 years ago
lain
4c918392c6
Fix most User tests.
6 years ago
lain
e7cd6e9739
Fix setting of keys.
6 years ago
lain
fc3bcf335e
Fix following locked users.
6 years ago
lain
d5af41b577
Fix note count update.
6 years ago
lain
6f90ceb2ed
Fix follower count test.
6 years ago
lain
812f5b058a
Fix blocking.
6 years ago
lain
756764266c
Formatting.
6 years ago
lain
b396dba425
Fix follower count setting.
6 years ago
lain
5c8f07f0a8
Fix note counting.
6 years ago
lain
47d883d3ab
Fix User deactivation.
6 years ago
lain
50585d051b
Add User.Info module
...
To validate and mutate the user.info field.
6 years ago
eal
62299be094
Federator: add retry queue.
6 years ago