William Pitcock
69a9e0563c
user: migrate follow/blocks import to job queue
2019-05-13 19:36:00 +00:00
William Pitcock
57d11ac9db
activitypub: move post rich media fetching to job queue
2019-05-13 19:36:00 +00:00
William Pitcock
32d4630c9c
user: move initial post fetching to job queue
2019-05-13 19:36:00 +00:00
lambda
b14a314ce7
Merge branch 'feature/federator-behaviours' into 'develop'
...
federator modularization (outgoing)
See merge request pleroma/pleroma!1140
2019-05-13 18:58:04 +00:00
Alexander Strizhakov
a2be420f94
differences_in_mastoapi_responses.md: fullname & bio are optionnal
...
[ci skip]
2019-05-13 18:35:45 +00:00
Sachin Joshi
7701a4c841
Make irreversible field default to false in filters
2019-05-14 00:13:15 +05:45
William Pitcock
44b182732e
nodeinfo: gather supported protocol names from federation modules
2019-05-12 19:15:29 +00:00
William Pitcock
28f7f4c6de
webfinger: build the response based on enabled federation modules
2019-05-12 19:05:03 +00:00
William Pitcock
55fa4b812a
federator: websub removal
2019-05-12 05:04:24 +00:00
William Pitcock
c23276a59a
activitypub: publisher: fixups
2019-05-12 05:04:24 +00:00
William Pitcock
fedaca15a3
websub: adapt to work as a federator publishing module
2019-05-12 05:04:24 +00:00
William Pitcock
179293e51c
salmon: refactor to work as a federator publishing module
2019-05-12 05:04:21 +00:00
William Pitcock
2aee62a456
federator: publisher: only attempt publishing if we know the activity is representable
2019-05-12 05:04:16 +00:00
William Pitcock
69158f1065
ostatus: only as:Public activities are representable
2019-05-12 05:04:16 +00:00
William Pitcock
85377c0b67
federator: move activitypub relaying to the AP publisher module
2019-05-12 05:04:16 +00:00
William Pitcock
676752bb83
federator: hook up Publisher.publish()
2019-05-12 05:04:16 +00:00
William Pitcock
f7a6a37c4e
federator: remove no longer used :publish_single_ap
2019-05-12 05:04:16 +00:00
William Pitcock
10695a28d2
federator: publisher: add publish() wrapper
2019-05-12 05:04:16 +00:00
William Pitcock
0afc8d7856
federator: publisher: integrate job queue, simplify publish_one logic
2019-05-12 05:04:16 +00:00
William Pitcock
ef1f9e8d4e
activitypub: split out outgoing federation into a federation module
2019-05-12 05:04:11 +00:00
William Pitcock
e7d292f80e
federator: add publisher module defining a contract for publishing behaviours
2019-05-12 03:08:50 +00:00
rinpatch
b9f84a382a
Normalize the object only after ensuring the activity type is Create
2019-05-12 03:01:42 +03:00
kaniini
131f883207
Merge branch 'fix/ostatus-activity-representer-depends-on-emebeded-objects' into 'develop'
...
Fix get_in_reply_to in OStatus' activity representer depending on embedded objects
See merge request pleroma/pleroma!1129
2019-05-11 16:52:26 +00:00
lain
01c45ddc9e
Search: Use RUM index.
2019-05-11 11:26:46 +02:00
Sachin Joshi
f01f995816
make url uniform in admin api
2019-05-11 14:46:00 +05:45
feld
c953ae8c3d
Initial bundle of basic AdminFE
...
Due to CSP headers we only allow connecting to self. If you want to
host AdminFE on a separate domain without CSP headers you will be able
to connect to any public Pleroma host.
2019-05-11 01:34:17 +00:00
rinpatch
1d78e42fd4
Remove get_in_reply_to calls in some functions because the result is unused and it does not have any side-effects
2019-05-10 13:49:34 +03:00
Francis Dinh
2a54e8c1f5
Use "repeated" instead of "retweeted" for repeated statuses in Twitter API
...
This makes it consistent with the language used in Pleroma FE (at least
in English).
Resolves https://git.pleroma.social/pleroma/pleroma-fe/issues/533
2019-05-09 19:58:34 -04:00
rinpatch
e4523c3010
Fix get_in_reply_to in OStatus' activity representer depending on embedded objects
2019-05-09 22:27:00 +03:00
lain
a33bec7d58
Conversations: Import order, import as read.
2019-05-09 16:39:28 +02:00
lain
e6d7f8d223
Credo fixes.
2019-05-08 18:19:20 +02:00
lain
6d19bb4eae
Conversations: Add mix task to 'import' old DMs.
2019-05-08 18:09:07 +02:00
lain
a4598b5e8b
Visibility: Make it more resilient.
2019-05-08 18:08:50 +02:00
lain
920bd47055
ActivityPub: Remove leftover printf debugging.
2019-05-08 17:40:24 +02:00
lain
fcf2f38d20
Conversations: Add a function to 'import' old DMs.
2019-05-08 17:37:00 +02:00
Alexander Strizhakov
bfeb33e951
Merge develop
...
Merge conflict in lib/pleroma/activity.ex
2019-05-08 14:34:36 +00:00
Maksim
799e1f48b5
Refactoring functions for dealing with oauth scopes.
2019-05-08 10:52:13 +00:00
kaniini
14deed7f7d
Merge branch 'refactor/preload-bookmarks-with-activities' into 'develop'
...
Optimize bookmarks by preloading them with activities
Closes #861
See merge request pleroma/pleroma!1121
2019-05-07 19:37:41 +00:00
William Pitcock
d64c3b604e
twitterapi: use order constraint to force descending order
2019-05-07 19:33:25 +00:00
William Pitcock
6020ff3fb6
activitypub: add optional order constraint to timeline query builder
2019-05-07 19:33:22 +00:00
rinpatch
4c5125dedc
Remove bookmarks
assoc and add a fake bookmark
assoc instead
2019-05-07 19:33:22 +00:00
rinpatch
be067ec2ab
Use with_preloaded_bookmark in create_by_object_ap_id_with_object
2019-05-07 19:33:22 +00:00
rinpatch
3a7c14645e
- Actually use preloaded bookmarks in views
...
- Preload bookmarks in bookmark timeline
- Rework bookmark preload tests
2019-05-07 19:33:22 +00:00
rinpatch
f841eb7cdb
Preload bookmarks wherever the object is preloaded
2019-05-07 19:33:22 +00:00
rinpatch
06947c9147
Remove bookmarks assoc
2019-05-07 19:33:22 +00:00
kaniini
a1a0df19c4
Merge branch 'docs/MRF-modules' into 'develop'
...
Documentation: MRF Modules
See merge request pleroma/pleroma!1122
2019-05-07 16:15:27 +00:00
William Pitcock
e71ddf23ba
containment: remove pointless moduledoc line
2019-05-07 16:11:22 +00:00
lambda
238dd72fad
Merge branch 'conversations_three' into 'develop'
...
Conversations once more.
See merge request pleroma/pleroma!1119
2019-05-07 14:43:21 +00:00
Egor Kislitsyn
1557b99beb
Merge remote-tracking branch 'pleroma/develop' into feature/disable-account
2019-05-07 16:51:11 +07:00
Maksim
1040caf096
fix format
...
Modified-by: Maksim Pechnikov <parallel588@gmail.com>
2019-05-06 17:51:03 +00:00
lambda
aacac9da0b
Merge branch 'feature/bbs' into 'develop'
...
BBS / SSH
See merge request pleroma/pleroma!997
2019-05-06 17:17:03 +00:00
Alexander Strizhakov
ce6ca0fefe
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into feature/845-improve-status-deletion
2019-05-06 16:45:22 +00:00
Haelwenn (lanodan) Monnier
69a5074893
Remove H1 in @moduledoc
2019-05-06 04:53:12 +02:00
Haelwenn (lanodan) Monnier
e41a2f98d5
mrf/tag_policy.ex: Add some documentation
...
mrf_tag:disable-remote-subscription exact way of working is quite
unclear to me. Is it the requester that is denied if they have a tag,
or is it the requestee if they have one?
2019-05-06 04:53:11 +02:00
Haelwenn (lanodan) Monnier
af62ace954
Add short documentation on every MRF Policy
2019-05-06 04:49:50 +02:00
lain
eb0fb73ddb
BBS: Credo fixes.
2019-05-04 15:47:50 +02:00
lain
c9d1cb2dce
BBS: Use cached user fetcher.
2019-05-04 15:08:07 +02:00
lain
4c76f49e60
BBS: small fixes.
2019-05-04 15:06:18 +02:00
lain
6ad8ddfd29
Merge remote-tracking branch 'origin/develop' into feature/bbs
2019-05-04 15:00:45 +02:00
rinpatch
d089ff2460
Merge branch 'fix/embeded-relationship-in-follows' into 'develop'
...
Fix embeded relationships in Mastodon API
See merge request pleroma/pleroma!1118
2019-05-03 20:36:13 +00:00
Haelwenn (lanodan) Monnier
b5ad1715b2
MastoAPI: profile update with emoji_map
2019-05-03 16:41:23 +02:00
Haelwenn (lanodan) Monnier
46bbf9e1cf
TwitterAPI: profile update with emoji_map
2019-05-03 16:30:24 +02:00
Haelwenn (lanodan) Monnier
85434669bb
Web.TwitterAPI.UserView: Also view local user emojis
2019-05-03 16:27:51 +02:00
Haelwenn (lanodan) Monnier
2f76a40d02
formatter.ex: Add get_emoji_map/1
2019-05-03 16:27:50 +02:00
Haelwenn (lanodan) Monnier
d70af32127
Pleroma.User: remove emojify on parse_bio
2019-05-03 16:27:50 +02:00
Haelwenn (lanodan) Monnier
85b5c60694
Pleroma.Formatter: width/height to class=emoji
2019-05-03 16:25:58 +02:00
lain
c42ded13a2
Credo fixes.
2019-05-03 13:53:17 +02:00
feld
acb04306b6
Standardize construction of websocket URL
...
This follows up on the change made in d747bd98
2019-05-03 11:45:04 +00:00
lain
a0c755cc4a
MastodonApi: Bump api level.
2019-05-03 13:40:43 +02:00
lain
81d1aa424d
Streamer: Stream out Conversations/Participations.
2019-05-03 13:39:14 +02:00
rinpatch
38b79461df
Fix embeded relationships in Mastodon API
...
Currently some endpoints render accounts without for user resulting in
embedded relationship being empty. It causes bugs in followers/following
tab in pleroma-fe but I fixed it for other endpoints as well just in
case
2019-05-03 00:49:17 +03:00
lambda
497d34b825
Merge branch 'iss-849' into 'develop'
...
Parse access_token from body parameters and URL parameters
See merge request pleroma/pleroma!1103
2019-05-02 14:17:17 +00:00
AkiraFukushima
533d8cd581
Parse access_token from body parameters and URL parameters
2019-05-02 21:04:00 +09:00
Roman Chvanikov
8af55728e4
Fix tests
2019-05-01 19:03:55 +02:00
lain
45f790becc
Merge remote-tracking branch 'origin/develop' into conversations_three
2019-05-01 18:40:41 +02:00
Maksim
c854bff8f5
Refactored Pleroma.Web.Auth.Authenticator
2019-05-01 13:28:04 +00:00
rinpatch
51e26f14f7
Remove redundant ensure_scrubbed_html
...
It is never used as handling for fake and non-fake activities was merged
into one function above it
2019-05-01 13:52:44 +03:00
lambda
0bcdaf378e
Merge branch 'bugfix/web-notification-special-char' into 'develop'
...
fix the web push notification with special char for status created
See merge request pleroma/pleroma!1092
2019-05-01 10:45:32 +00:00
Alex S
f11e7037c2
test fixes
2019-05-01 16:09:53 +07:00
Alex S
bdfa3a6fa8
Merging with develop
...
Conflicts:
lib/pleroma/web/activity_pub/transmogrifier.ex
lib/pleroma/user.ex
2019-05-01 12:29:33 +07:00
Sachin Joshi
85fa2fbce4
add scrubber for html special char
2019-05-01 01:37:17 +05:45
Sachin Joshi
cd6da3606b
Merge branch 'develop' into bugfix/web-notification-special-char
2019-05-01 00:21:30 +05:45
rinpatch
ce4825c1dc
Do not normalize objects in stream_out unless the activity type is
...
Create
Saves quite a bit of time with delete activities because they would
always query the db
2019-04-30 20:21:28 +03:00
lain
b0951a8849
WebPush: Use Object.normalize, rewrite tests so they test reality.
2019-04-29 18:15:30 +02:00
rinpatch
0fd176b990
Merge branch 'fix/add-default-scope-mastoapi' into 'develop'
...
Add default_scope to /api/v1/update_credentials
See merge request pleroma/pleroma!1100
2019-04-29 06:45:18 +00:00
kaniini
292c69481b
Merge branch 'regression/rights-only-for-admin' into 'develop'
...
Fix `rights` in TwitterAPI's user entity being present only for Admins/Moderators
See merge request pleroma/pleroma!1102
2019-04-28 23:05:14 +00:00
rinpatch
61ca2f7a4e
Fix rights
in TwitterAPI's user entity being present only for
...
Admins/Moderators
In !1093 I reused `maybe_with_role` for `rights` object, however I
missed that `maybe_with_role` is called only for admins/moderators.
2019-04-28 19:42:43 +03:00
rinpatch
ce3789e39a
Add default_scope to /api/v1/update_credentials
2019-04-27 23:55:54 +03:00
rinpatch
c3e9fcf098
Fix bookmarks depending on embeded object and move checking if the
...
status is bookmarked to SQL
2019-04-27 23:06:46 +03:00
kaniini
002ea343f8
Merge branch 'feature/bbcode' into 'develop'
...
BBCode support (backend)
See merge request pleroma/pleroma!1097
2019-04-27 07:44:24 +00:00
William Pitcock
501af917b5
add support for bbcode
2019-04-26 22:35:02 +00:00
lambda
4de5fef1f8
Merge branch 'feature/807-bookmark-endpoint-extension' into 'develop'
...
Feature/807 bookmark endpoint extension
Closes #807
See merge request pleroma/pleroma!1059
2019-04-26 11:59:47 +00:00
kaniini
48f68fd133
Merge branch 'feature/mastoapi-new-config' into 'develop'
...
Fix leaking private configuration parameters in Mastodon and Twitter APIs, and add new configuration parameters to Mastodon API
This patch:
- Fixes `rights` in TwitterAPI ignoring `show_role`
- Fixes exposing default scope of the user to anyone in Mastodon API
- Extends Mastodon API to be able to show and set `no_rich_text`, `default_scope`, `hide_follows`, `hide_followers`, `hide_favorites` (requested by the FE in #674 )
Sorry in advance for 500 line one commit diff, I should have split it up to separate MRs
See merge request pleroma/pleroma!1093
2019-04-26 02:41:35 +00:00
Mark Felder
24c3e2db2c
Add mediaproxy whitelist capability
2019-04-25 18:11:47 -05:00
rinpatch
dfc8425659
Move settings to Source subentity
2019-04-25 10:31:14 +03:00
Alex S
a825056d4d
test fixes
2019-04-25 14:09:57 +07:00
Alex S
85953c0836
fixes for tests
2019-04-25 13:46:40 +07:00
Alex S
229ce6abbc
migration without using old field name
...
removing old field from db, after bookmarks migration
2019-04-25 13:42:10 +07:00
Alex S
3c2ae80008
unused
2019-04-25 13:42:10 +07:00
Egor Kislitsyn
c157e27a00
Merge branch 'develop' into feature/disable-account
2019-04-25 13:41:10 +07:00