540cce5d10
When logging in, try treating the login as an email
...
Closes #245
2018-08-25 23:29:03 +03:00
ffa552f1a4
Merge branch 'feature/twitterapi-object-description' into 'develop'
...
twitter api: provide object descriptions as attachment description field
See merge request pleroma/pleroma!293
2018-08-25 00:20:25 +00:00
aab2bdddf4
twitter api: provide object descriptions as attachment description field
2018-08-25 00:12:58 +00:00
290798b821
http: fix TLS server name indication
...
by default, hackney only sent TLS server name indication if TLS was locked
to TLS 1.2.
since there are many instances out there not speaking TLS 1.2, it is not
acceptable to lock SNI to TLS 1.2.
closes #261
2018-08-24 20:04:50 +00:00
be7a6db1f5
Merge branch 'bugfix/formatter-single-char-nicks' into 'develop'
...
formatter: fix single char local nicknames
Closes #163
See merge request pleroma/pleroma!290
2018-08-24 18:42:14 +00:00
9ded0ee1a5
Merge branch 'config/fe-collapse-subject' into 'develop'
...
fe config: add collapse_message_with_subject fe option
See merge request pleroma/pleroma!289
2018-08-24 18:27:43 +00:00
3e10d13909
formatter: adjust regexp captures to match local users with single character nicknames ( closes #163 )
2018-08-24 18:22:47 +00:00
09cb402203
fe config: add collapse_message_with_subject fe option
2018-08-24 18:21:42 +00:00
ba6e3eba33
Move invite task to pleroma namespace
...
Some other minor changes were made to make it consistent with the behavior of
other tasks both within Pleroma and the conventions set by dependencies such as
Phoenix. Namely, the task is named `gen.invite` and `IO.puts` has been replaced
with references to `Mix.shell()` where appropriate.
2018-08-23 12:46:13 -04:00
8a1dc0de92
Refactor Mix tasks
...
1. Move Mix tasks into a `pleroma` namespace, to avoid
collisions with dependent packages.
2. Rename and condense tasks into two `pleroma.user` and
`pleroma.gen.instance` tasks for consistency with Hex and Phoenix.
3. Add additional functionality to the tasks to make them more
user-friendly. Arguments with sensible defaults were demoted to flags
and in the interactive `generate_config` (renamed to
`pleroma.gen.instance`), flags were added to allow non-interactive
use, though interactive use remains the primary interface. That task
also now prompts the user for database parameters.
4. Documentation has been added to both tasks such that `mix help` now
shows useful information.
5. Finally, use of IO.puts in tasks has been replaced with Mix.shell()
equivalents to make the behavior more consistent with Mix tasks in
other packages, and such that variables like MIX_QUIET are respected.
The only exception is in `mix pleroma.user reset_password`, wherein
the URL must always be printed regardless of the value of MIX_QUIET
since that's its entire purpose.
2018-08-23 11:33:16 -04:00
bf9f68b681
debug
2018-08-23 11:52:18 +09:00
a909fe45a6
formatting
2018-08-23 01:34:36 +00:00
52b44184b4
transmogrifier: reject activities lacking a valid ID
2018-08-23 01:25:26 +00:00
9b046d2a84
fixed notifications API completely breaking if there's a like for
...
missing (deleted) post.
2018-08-22 16:10:59 +03:00
d5bdd55b5d
[Pleroma.Web.TwitterAPI.UserView]: Do not fail if user.bio is nil
2018-08-22 01:47:25 +02:00
5dde6e4a00
[Pleroma.Web.MastodonAPI.StatusView] Fix rendering peertube videos
2018-08-22 01:46:26 +02:00
f6b06d2ac8
Merge branch 'feature/peertube_2' into 'develop'
...
rebase/update of feature/peertube
See merge request pleroma/pleroma!217
2018-08-21 16:58:44 +00:00
a6d4cc8917
Merge branch 'sanitize-bio' into 'develop'
...
mastodon api: sanitize the bio HTML
See merge request pleroma/pleroma!282
2018-08-21 16:56:24 +00:00
046741c60d
[Pleroma.Web.MastodonAPI.StatusView] Support Peertube Video titles
2018-08-21 18:34:56 +02:00
f5b056e3ce
[Pleroma.Web.ActivityPub.Transmogrifier]: Fix likes
2018-08-21 18:26:12 +02:00
3b8ef24532
Fix attachement rendering
2018-08-21 18:24:10 +02:00
a6b021a52b
Render peertube videos in mastodon.
2018-08-21 18:24:10 +02:00
c381d0b577
Use activitypub to fetch posts.
...
This falls back to ostatus.
2018-08-21 18:24:09 +02:00
74c74decf5
Basic peertube support.
2018-08-21 18:24:09 +02:00
ef4f982e2c
Pleroma.Web.ActivityPub.Transmogrifier: Fix actor being a list of objects (Peertube)
2018-08-21 18:24:06 +02:00
1495d04789
fix test for converting bio \r\n to <br>.
2018-08-21 14:51:27 +01:00
cdb3dd48ab
Format
2018-08-21 14:12:55 +01:00
5debd7b5cc
Twitter API: Support Mastodon-style bios
...
(multi-line, with links, and user mentions)
2018-08-21 14:03:36 +01:00
175f0bebbc
mastodon api: sanitize the bio HTML
2018-08-21 10:53:53 +01:00
c1b8a6a73b
Merge branch 'feature/formatter-consistent-hashtag-mentions' into 'develop'
...
formatter: consistent presentation of hashtags and mentions
See merge request pleroma/pleroma!280
2018-08-20 18:44:52 +00:00
c033d2004b
formatting
2018-08-20 18:40:05 +00:00
145546e52a
common api: format hashtags in the same way as we format mentions
2018-08-20 18:39:47 +00:00
f1c407e777
Merge branch 'fix/redirect-on-user-fetch' into 'develop'
...
ActivityPub: follow redirects when fetching user
See merge request pleroma/pleroma!278
2018-08-20 12:13:07 +00:00
51a21284c6
ActivityPub: follow redirects when fetching user
2018-08-20 15:03:25 +03:00
6698749073
Fix typo in app creation response
...
Mastodon sends redirect_uri (singular), so should Pleroma.
2018-08-17 12:48:24 +00:00
a3ef2ebb35
mastodon api controller: client_name, not name
2018-08-16 23:50:49 +00:00
b5a92b1199
mastodon api: add undocumented fields to json response, return app id as string like mastodon itself does
2018-08-16 23:40:42 +00:00
183ccd1812
Merge branch 'dev-lanodan-url-regex' into 'develop'
...
lib/pleroma/formatter.ex: Fix URL regex
Closes #127
See merge request pleroma/pleroma!69
2018-08-16 15:41:16 +00:00
c004b6ea0a
Merge branch 'mastofe/system-font' into 'develop'
...
Mastodon frontend: Use system font
See merge request pleroma/pleroma!247
2018-08-16 15:38:59 +00:00
5fbb14f5ec
Merge branch 'bugfix/federation-kroeg' into 'develop'
...
fix federation with kroeg
See merge request pleroma/pleroma!272
2018-08-16 15:20:15 +00:00
38361e7b5e
Merge branch 'fix/put-repeats-at-activitypub-outbox' into 'develop'
...
Fix: Output repeats at ActivityPub outbox
Closes #191
See merge request pleroma/pleroma!175
2018-08-16 15:19:46 +00:00
8dc715b30b
Merge branch 'fix/normalize-file-extension' into 'develop'
...
Normalize file extension for uploaded files
Closes #218
See merge request pleroma/pleroma!233
2018-08-16 15:17:17 +00:00
9908cf8fda
Merge branch 'feature/suggestions-api-with-third-party-recommendation-engine' into 'develop'
...
Feature / Suggestions API with third party recommendation engine
See merge request pleroma/pleroma!254
2018-08-15 07:47:33 +00:00
f446e75577
activitypub: transmogrifier: add necessary translations for kroeg
2018-08-14 17:09:11 +00:00
92caa2632b
Use Image type for emoji icons.
2018-08-13 16:21:18 +03:00
1ed1ff17a4
ActivityPub user view: include tag if present.
2018-08-13 16:11:48 +03:00
f9d13558c8
CommonAPI: add emoji to user source data on update
2018-08-13 15:27:20 +03:00
8c0c930041
formatting
2018-08-12 19:42:21 +02:00
ffd9ad1f0c
Fix for elixir 1.7.
2018-08-12 18:41:33 +02:00
13440a80e1
Merge branch 'feature/invites' into 'develop'
...
Invites
Closes #108
See merge request pleroma/pleroma!208
2018-08-12 12:04:15 +00:00
1e9d152d60
Update generate_invite_token.ex
2018-08-12 11:11:08 +00:00
9de6145737
Merge branch 'fix/remote-follow-errormessage' into 'develop'
...
Remote follow: don't show confusing error if already following
See merge request pleroma/pleroma!267
2018-08-12 10:55:53 +00:00
ae9c4983d7
Merge branch 'bugfix/gopher-empty-lines' into 'develop'
...
lib/pleroma/gopher/server.ex: Fix errorneous empty lines
See merge request pleroma/pleroma!270
2018-08-12 10:55:21 +00:00
e81f788cb8
Merge branch 'emoji-in-account-view' into 'develop'
...
Render emoji in user profiles
See merge request pleroma/pleroma!265
2018-08-12 10:41:30 +00:00
af30f3f648
lib/pleroma/gopher/server.ex: Fix errorneous empty lines
2018-08-10 18:01:42 +02:00
e7b00f202f
fix gopher server informational messages
...
some gopher clients did not accept those lines due to a missing tab
2018-08-10 10:45:44 +02:00
db5cdfa333
Remote follow: don't show confusing error if already following
2018-08-09 20:47:29 +03:00
37b802682c
HTML-sanitize usernames before emojifying.
2018-08-09 13:07:03 +03:00
ed9738e031
Add tests for emoji in user profiles
...
Also use the correct field in TwitterAPI...
2018-08-08 09:24:50 +03:00
cee63ad3f7
TwitterAPI user view: add screen_name_html and description_html.
2018-08-08 08:38:25 +03:00
c2d1a5e9c4
MastoAPI AccountView: render profile emoji.
2018-08-07 21:56:50 +03:00
59b42531a3
Merge branch 'bugfix/duplicate-follow-requests' into 'develop'
...
user: filter out duplicate follow requests
Closes #228
See merge request pleroma/pleroma!263
2018-08-06 18:07:27 +00:00
d91fd48edf
user: do not leak virtuals in account search
2018-08-06 11:29:02 +00:00
ecfd4b2106
user: hide virtual actors from statistics queries
2018-08-06 11:29:01 +00:00
de6be63b1b
activitypub: do not show observable effects of non-public boosts
2018-08-06 11:28:57 +00:00
5202d4ce10
relay: do not relay in test mode
2018-08-06 08:35:56 +00:00
0ca9b9ff96
run mix format
2018-08-06 08:26:36 +00:00
5abf9ad602
relay: reintroduce @allow_relay
2018-08-06 08:22:18 +00:00
1e1a29f084
activitypub: relay: fix up AS2 actor object
2018-08-06 08:22:17 +00:00
e49131bb72
relay: move to /relay endpoint from / due to webapp issues
2018-08-06 08:22:16 +00:00
2b628f2341
relay: only relay create activities
2018-08-06 08:22:16 +00:00
ae3cb652b6
user: set up a valid followers address to use
2018-08-06 08:22:15 +00:00
56dc8db582
activitypub: relay: add relay following/followers collection URLs
2018-08-06 08:22:14 +00:00
1c40a631e8
federator: actually relay the public activities
2018-08-06 08:22:14 +00:00
f9b0fc4ddb
relay: remove @allow_relay for the moment
2018-08-06 08:22:13 +00:00
266b314051
relay: fix invoking federator, use a timer to sleep the mix task to force a context switch
2018-08-06 08:22:12 +00:00
99be3d3dcc
relay: add relay follow/unfollow tasks
2018-08-06 08:22:12 +00:00
1c90f88393
user: remote actors can have no nickname if they are virtual services
2018-08-06 08:22:11 +00:00
7bed350a23
config: allow relaying to be disabled
2018-08-06 08:22:10 +00:00
b7ca7f282a
activitypub: refactor relay concerns into new relay module
2018-08-06 08:22:10 +00:00
00e890264c
activitypub: represent relay actor at instance root
2018-08-06 08:22:09 +00:00
4807a52284
user: support creating an actor which represents the instance itself
2018-08-06 08:22:07 +00:00
275c42e438
user: filter out duplicate follow requests
2018-08-05 01:11:13 +00:00
0ee29994a5
formatter: preserve case of hashtags
...
when generating hashtag links, we used the casefolded version that we use in
the link URLs, instead of the original version.
accordingly, adjust the formatter to use the original text for the links, while
keeping the casefolded version for the URLs.
2018-08-05 00:37:38 +00:00
f72cfada1a
add suggestions/web config
2018-08-02 18:03:35 +09:00
3be58ad34e
activitypub: actually send digest header when federating
...
this is needed for backwards compatibility with non-digest pleroma instances
2018-08-01 10:32:02 +00:00
d5091c3175
Allow additionnal schemes in the config
2018-08-01 02:52:42 +02:00
8da406afa2
activitypub: verify remote http signature digests by recomputing the digest and replacing the digest header
2018-07-31 23:24:30 +00:00
2890aef9e8
activitypub: add digest header to outbound messages and sign it
2018-07-31 23:24:30 +00:00
3623504e5d
[Pleroma.Formatter]: Add support for non-HTTP schemes in URIs
...
The call to the regex in add_links is there just to be sure it’s a legal URI, it can be removed if you want to get more performance.
The URI Schemes list is sorted, but with http(s) at the start (in case it might make it faster for common links).
Closes: https://git.pleroma.social/pleroma/pleroma/issues/127
2018-07-30 22:01:48 +02:00
bc2668bb63
Merge remote-tracking branch 'upstream/develop' into feature/filter_exif
2018-07-19 17:44:18 -07:00
cc9c062b55
merge
2018-07-19 17:42:00 +09:00
41b0ecef95
Merge branch 'tests/plume' into 'develop'
...
Articles/Notes with a actor list outside object
See merge request pleroma/pleroma!252
2018-07-19 07:35:34 +00:00
54963a6379
Merge branch 'bugfix/activitystreams-notice-urls' into 'develop'
...
ostatus: return AS2 objects on /notice and /activities URLs like with /objects.
Closes #206
See merge request pleroma/pleroma!251
2018-07-19 07:31:33 +00:00
6f23fb53d3
Merge branch 'feature/fe-configuration' into 'develop'
...
serverside frontend configuration
See merge request pleroma/pleroma!256
2018-07-19 07:31:10 +00:00
b12d17d2ce
configurable timeout
2018-07-18 13:36:20 +09:00
e4dd58307a
better configuration
2018-07-18 09:58:59 +09:00
b23630076f
TwitterAPI: present pleroma frontend config in API
2018-07-17 15:46:24 +00:00
cf219b6add
config: make instance description configurable
2018-07-17 15:46:23 +00:00
5b4a21317d
correct error message
2018-07-17 17:29:18 +09:00
8ff336e02a
debug
2018-07-17 17:00:14 +09:00
2b7b1b3e6b
add suggestionsThirdPartyEngine into /nodeinfo/2.0.json
2018-07-17 16:56:30 +09:00
d76f0d87be
do nothing if configuration is skipped
2018-07-17 16:45:18 +09:00
df3233e7e7
improve getting host name
2018-07-17 13:20:58 +09:00
99c0252314
mastodon api: support descriptions in media api, add PUT endpoint for updating metadata about a media upload
2018-07-17 03:40:47 +00:00
cd19d37a90
mastodon api: use object name as alt text
2018-07-17 03:40:46 +00:00
f10291a1d3
upload: use generic Document object type instead of Image (mastodon compatibility)
...
Mastodon does not use the object name as alt text when the object is an Image.
2018-07-17 03:40:45 +00:00
e7c580828c
format
2018-07-15 20:36:26 +09:00
2eeaf01627
id field
2018-07-14 14:03:30 +09:00
127882a5d5
configurable
2018-07-14 11:41:09 +09:00
eb0afda3a7
http access to third party user recommendation
2018-07-14 10:04:37 +09:00
5469fb9561
Merge remote-tracking branch 'upstream/develop' into feature/filter_exif
2018-07-13 11:14:37 -07:00
3812b627ca
better mock /api/v1/suggestions
2018-07-14 00:52:23 +09:00
4a21c1b343
mock /api/v1/suggestions
2018-07-14 00:44:18 +09:00
f944f8157a
/api/v1/suggestions endpoint
2018-07-14 00:21:38 +09:00
7501481db4
[Pleroma.Web.ActivityPub.Transmogrifier] Add Person finding
2018-07-12 23:37:07 +02:00
8472fba2a7
[Pleroma.Web.ActivityPub.Transmogrifier]: Fix actor key outside of object
...
The code here is copied from feature/peertube by lain.
Co-authored-by: lain <lain@soykaf.club>
2018-07-12 23:37:00 +02:00
0899588e4d
ostatus: return AS2 objects on /notice and /activities URLs like with /objects.
2018-07-12 17:15:47 +00:00
d93789dfde
Merge branch 'feature/object-normalization' into 'develop'
...
object normalization
See merge request pleroma/pleroma!238
2018-07-12 16:48:15 +00:00
ceffb91065
Merge branch 'feature/mediaproxy-nodeinfo' into 'develop'
...
[Pleroma.Web.Nodeinfo.NodeinfoController]: add mediaProxy metadata
Closes #229
See merge request pleroma/pleroma!235
2018-07-12 16:47:19 +00:00
b1fcfcfae1
Merge branch 'bugfix/activitypub-object-actor' into 'develop'
...
activitypub: more robustly handle object-to-actor associations
See merge request pleroma/pleroma!250
2018-07-12 16:46:50 +00:00
590d4df77c
activitypub: more robustly handle object-to-actor associations
2018-07-12 16:39:03 +00:00
b832df1e15
formatting
2018-07-12 16:12:54 +00:00
f03e57f764
twitter api: activity representer: add summary field for testsuite
2018-07-12 16:12:16 +00:00
152a526237
twitter api: refactor activity html generation, add support for Articles
2018-07-12 16:11:42 +00:00
3b799f22b7
twitterapi: activity view: expose message summary text
2018-07-12 16:11:36 +00:00
b806aa36c8
Update nodeinfo_controller.ex
2018-07-12 06:00:55 +00:00
fe4387077a
Merge branch 'feature/default-scope' into 'develop'
...
default scope setting
See merge request pleroma/pleroma!239
2018-07-12 05:59:12 +00:00
4a922305af
Merge branch 'feature/article-support' into 'develop'
...
article support (plume, etc)
See merge request pleroma/pleroma!240
2018-07-12 05:58:39 +00:00
14054dd582
Merge branch 'feature/auto-shortcodes' into 'develop'
...
Feature: automatic shortcodes for emoji
See merge request pleroma/pleroma!245
2018-07-12 05:56:29 +00:00
33b0334216
Merge branch 'bugfix/status-url-field' into 'develop'
...
[Pleroma.Web.MastodonAPI.StatusView]: Fill the url field for statuses
Closes #231
See merge request pleroma/pleroma!246
2018-07-12 05:55:20 +00:00
8546551257
activitypub: switch to using x509 representation for public keys instead of pkcs#1
2018-07-12 03:30:22 +00:00
4326cb9920
[Pleroma.Web.Nodeinfo.NodeinfoController]: add mediaProxy metadata
...
Closes: https://git.pleroma.social/pleroma/pleroma/issues/229
2018-07-12 02:06:46 +02:00
7a351cb36f
[Pleroma.Web.MastodonAPI.StatusView]: Fill the url field for statuses
...
Closes: https://git.pleroma.social/pleroma/pleroma/issues/231
2018-07-12 01:57:25 +02:00
835345754d
/web/* template: Add class system-font
2018-07-03 17:26:47 +02:00
748fff6544
Fix auto-shortcode emoji
...
Emoji were broken due to `Pleroma.Formatter` not knowing about the
auto-shortcode emoji. This moves that logic from
`Pleroma.Web.TwitterAPI.UtilController` to `Pleroma.Formatter`.
Additionally, it's now possible to specify multiple shortcode globs, and
the default globs were changed to `["/emoji/custom/**/*.png"]`, since
that's in the .gitignore and the files there would have to be shortcode
emoji anyway.
2018-06-30 21:31:08 -04:00
c171f9790b
Move emoji glob setting to config.exs
...
Also, a bit of formatting, and the glob includes an "/emoji/" prefix to
make it more intuitive to users
2018-06-30 17:58:44 -04:00
0bfbf15b37
Allow emojis to be added automatically
2018-06-30 17:58:37 -04:00
971bb4f2bd
activity interpretation: formatting
2018-06-27 13:38:19 +00:00
66819ea784
twitter api: use ActivityView.render_content() where appropriate instead of duplicating the logic
2018-06-27 13:38:07 +00:00
ea982e7503
mastodon api: add interpreter for Article activity types
2018-06-27 13:38:00 +00:00
121c1f6230
twitter api: refactor activity html generation, add support for Articles
2018-06-27 13:37:53 +00:00
bd479606ba
utils: make_create_data: add support for Article objects
2018-06-27 13:37:35 +00:00
c42f28b82c
transmogrifier: accept Article activities
2018-06-27 13:37:26 +00:00
2f14996d9a
twitter api: allow setting default_scope
2018-06-27 13:15:55 +00:00
dcdf7b6686
twitter api: user view: show default message scope if known
2018-06-27 13:15:50 +00:00
4f6de34f4f
mastodon api: use info["default_scope"] if available for post scope
2018-06-27 13:15:42 +00:00
7c63e70de1
activitypub: use Activity.normalize() in several places instead of using Activity.get_by_ap_id() directly.
2018-06-27 13:08:12 +00:00
6f4ca7ddf7
ostatus: use Activity.normalize() instead of directly using Activity.get_by_ap_id().
2018-06-27 13:08:05 +00:00
5b240c3b18
federator: use Activity.normalize() instead of directly using Activity.get_by_ap_id().
2018-06-27 13:07:55 +00:00
bc05548370
ostatus: use Object.normalize() instead of Object.get_by_ap_id() directly.
2018-06-27 13:07:45 +00:00
49da04c509
common api: use Object.normalize() instead of Object.get_by_ap_id() directly.
2018-06-27 13:07:35 +00:00
15d624e077
activitypub: use Object.normalize() instead of Object.get_by_ap_id() directly.
2018-06-27 13:07:29 +00:00
fb04fecfb4
streamer: use Object.normalize() instead of Object.get_by_ap_id() directly.
2018-06-27 13:07:23 +00:00
47189531c5
user: use Object.normalize() instead of Object.get_by_ap_id() directly.
2018-06-27 13:07:17 +00:00
b036a19c21
activity: add normalize() to find a complete activity given either URI or partial structure
2018-06-27 13:07:12 +00:00
a200943240
object: add helper functions to handle various forms of a given object and return a normalized one
2018-06-27 13:06:52 +00:00
dc8ace29d1
use the correct end file
2018-06-26 15:09:45 -07:00
ca63585a32
maybe I should learn proper elixir ;D
2018-06-26 14:35:35 -07:00
d8d43f1173
do the filtering
2018-06-26 14:03:23 -07:00
c67cf8e9af
format...
2018-06-26 13:49:57 -07:00
cb21bf5fc2
filter exif data #187
2018-06-26 13:45:47 -07:00
beb940a57e
[Pleroma.Web.MastodonAPI.MastodonAPIController]: Add rights to initial_state
...
Related to https://git.pleroma.social/pleroma/mastofe/issues/20
2018-06-26 20:48:35 +02:00
fc012491a5
Merge branch 'fix/mutes.json-emptyarray' into 'develop'
...
Return empty array from /api/qvitter/mutes.json
See merge request pleroma/pleroma!234
2018-06-25 08:45:42 +00:00
dfc96f222c
Merge branch 'feature/configurable-blocks' into 'develop'
...
Add more configurability to how blocks work
See merge request pleroma/pleroma!203
2018-06-25 06:12:29 +00:00
ea214b8ba6
combined outgoing_blocks with statement
2018-06-24 23:05:44 -07:00
6160a1b3c0
mix format
2018-06-24 15:24:41 -07:00
1299bccc7d
return unquoted empty array from /api/qvitter/mutes.json
2018-06-23 23:20:30 -07:00
6316003946
fixes- found that TwitterAPI.Controller adds .json suffix already
2018-06-23 23:05:54 -07:00
f2badd4424
return empty array for api/qvitter/mutes.json queries instead of html
2018-06-23 22:21:39 -07:00
c4038ede07
fix mind-crushingly dumb syntax error
2018-06-23 14:32:00 -07:00
f4990283de
change moved attributes into normal variables
2018-06-23 14:27:07 -07:00
4e099fcfa9
move configurable module attributes into relevant functions
2018-06-23 14:16:08 -07:00
5a4a45b875
[Pleroma.Web.MastodonApi.MastodonApiController] Add initial_state.meta.max_toot_chars
2018-06-23 16:22:49 +02:00
a05c0ff61d
[Pleroma.Web.MastodonApi.MastodonApiController] Add /api/v2/search
2018-06-23 16:22:47 +02:00
359093d73b
Fake 2.4.0 API
2018-06-23 16:12:57 +02:00
c45133377a
lib/pleroma/web/activity_pub/mrf/simple_policy.ex: mix format
...
Hnng!
2018-06-23 16:12:57 +02:00
082920044a
Normalize file extension for uploaded files
2018-06-21 14:04:12 -04:00
60d6038be5
mrf simple: add accept lists
...
accept lists supplement reject lists by requiring that any message accepted by contained
by the accept list.
in other words, this functionality can be used to implement instances similar to
awoo.space.
2018-06-19 21:28:24 +00:00
90cf75f4a7
Merge branch 'features/column_media_streaming' into 'develop'
...
Add streaming to media tabs of federated and local TLs
See merge request pleroma/pleroma!225
2018-06-19 09:50:05 +00:00
be800d7936
Merge branch 'bugfix/block-follow-relationships' into 'develop'
...
fix follow relationship leaks when blocked
See merge request pleroma/pleroma!230
2018-06-19 09:42:45 +00:00
056305dfa7
user: add helper function to fetch a user given only an ap_id (fix tests)
2018-06-19 08:31:06 +00:00
db0731b6ac
Merge branch 'feature/exclude-replies-filter' into 'develop'
...
activitypub: support filtering activities by whether or not they are a reply (closes #109 )
Closes #109
See merge request pleroma/pleroma!226
2018-06-19 05:15:11 +00:00
320ca7b11e
user: when processing a block in User.block(), ensure all follow relationships are broken
...
this is needed for activitypub conformance
ref #213
2018-06-19 00:59:26 +00:00
c95941e64d
activitypub transmogrifier: fix handling of contentMap.
2018-06-18 22:14:50 +00:00
7e0f62acee
object: add helper functions to handle various forms of a given object and return a normalized one
2018-06-18 05:27:10 +00:00
6f384d35dd
ostatus: we need to include the original author of a message as a mention
...
this is due to the use of activity.recipients which may not necessarily contain the original
author if the actors are not following each other.
2018-06-18 05:27:09 +00:00
591c82620e
activitypub: filter destination list for announce activities differently than normal ( closes #164 )
2018-06-18 04:36:25 +00:00
4f589998ee
activitypub: support filtering activities by whether or not they are a reply ( closes #109 )
2018-06-18 03:21:32 +00:00
b670d4d683
MastodonAPI: Add streaming to media tabs of federated and local TLs
2018-06-17 16:17:15 +02:00
0b1ca6a584
Token-generating task
2018-06-17 14:30:07 +03:00
2e294ee44a
Merge branch 'develop' into feature/configurable-blocks
2018-06-16 15:37:16 -07:00
1ea4a18ad8
Merge branch 'feature/configure-mrf-rejectnonpublic' into 'develop'
...
Configs for mrf_rejectnonpublic
See merge request pleroma/pleroma!205
2018-06-16 10:39:36 +00:00
a938d07df1
Merge branch 'bugfix/mastofe_thread_render' into 'develop'
...
lib/pleroma/web/mastodon_api/views/status_view.ex: Fix status.json so it renders threads
See merge request pleroma/pleroma!223
2018-06-15 20:43:30 +00:00
72c2915ecd
Pleroma.Web.MastodonAPI.StatusView: Fix status.json so it renders threads
2018-06-15 22:14:17 +02:00
00d7d109ef
Fix typo
2018-06-15 22:01:17 +02:00
de20c8d620
Merge branch 'fix/missing-file-extension' into 'develop'
...
Add missing file extension if file does not have one
See merge request pleroma/pleroma!222
2018-06-14 19:11:30 +00:00
0a95b5594b
Add missing file extension if file does not have one
2018-06-14 12:16:34 -04:00
12c7a023de
upload.ex: add MPEG Layer 3 file header.
2018-06-14 16:41:08 +03:00
2723fb5150
Merge branch 'bugfix/mrf-orphaning' into 'develop'
...
activitypub transmogrifier: handle activity lookup failure
Closes #156
See merge request pleroma/pleroma!216
2018-06-14 07:20:54 +00:00
8c7fdcb31b
Merge branch 'feature/twitterapi-unrepeat' into 'develop'
...
Add TwitterAPI unretweet endpoint and cleanup AP.unannounce
See merge request pleroma/pleroma!218
2018-06-14 07:19:36 +00:00
2c303b3302
Merge branch 'bugfix/oauth2-param-name' into 'develop'
...
oauth: support either name or username parameter with grant_type=password
Closes #180
See merge request pleroma/pleroma!219
2018-06-14 07:14:18 +00:00
280ac243aa
Merge branch 'bugfix/oauth-password-with-email' into 'develop'
...
oauth: fix password-based login when username is email address
Closes #199
See merge request pleroma/pleroma!220
2018-06-14 07:13:05 +00:00
5442466569
oauth: fix password-based login when username is email address
...
closes #199
2018-06-14 02:32:30 +00:00
4894b88b1b
oauth: support either name or username parameter with grant_type=password
...
closes #180
2018-06-14 02:07:43 +00:00
1555c66650
Add unretweet TwAPI endpoint and cleanup AP.unannounce
2018-06-13 21:33:36 -04:00
401e8af943
activitypub transmogrifier: handle activity lookup failure
...
with the introduction of MRF, it is possible that an activity may be orphaned from it's parent, if
an activity in the chain was rejected by the active MRF policies. accordingly, handle this in the
same way as any other orphaned activity.
closes #156
2018-06-13 22:19:38 +00:00
b5bc08fac3
streamer: don't relay boosts of messages which would otherwise be blocked
2018-06-13 21:59:56 +00:00
ea42ba603f
Merge branch 'feature/webfinger-rfc7033-compliant' into 'develop'
...
webfinger: send JRD by default instead of XRD
See merge request pleroma/pleroma!211
2018-06-13 07:18:03 +00:00
3d402a9e20
webfinger: send JRD by default instead of XRD
...
JRD being the default representation for WebFinger responses was standardized 5 years ago in
RFC 7033.
2018-06-13 07:03:14 +00:00
59f95a7095
webfinger: refactor webfinger() functions
...
- remove code duplication
- move user lookup to parent with statement
- tighten both user lookup by nickname and activitypub URI with a type constraint
2018-06-13 06:42:27 +00:00
3326205f95
set_moderator: ensureall applications are started.
2018-06-12 15:42:40 +03:00
9c1cf1befb
formatting
2018-06-12 15:01:40 +03:00
f42ffbe9a8
Initial invites support + tests.
2018-06-12 14:55:16 +03:00
3f42806b1b
Merge branch 'develop' into 'develop'
...
Dedupe uploads
See merge request pleroma/pleroma!115
2018-06-12 08:26:26 +00:00
f34232da86
Update sample_config.eex
2018-06-12 07:23:45 +00:00
564c73ab24
Merge branch 'feature/list-streaming' into 'develop'
...
MastoAPI: Add streaming for lists.
See merge request pleroma/pleroma!183
2018-06-12 07:19:45 +00:00
9810471237
router: remove stub /domain_blocks entry
2018-06-11 23:40:19 +00:00
f8e0942745
twitter api: add approve/deny endpoints
2018-06-11 22:15:53 +00:00
e08cf21e5b
twitter api: add friend requests list api
2018-06-11 22:15:53 +00:00
ba8dab7542
twitterapi: user view: return if an account is locked or not
2018-06-11 22:15:53 +00:00
d96377f359
activitypub transmogrifier: accept/reject outgoing: we might send the actual object instead of the URI in some cases, handle it
2018-06-11 22:15:53 +00:00
5eed1ea181
run mix format
2018-06-11 22:15:53 +00:00
993312cdb3
twitterapi: add profile setting for locked/unlocked accounts
2018-06-11 22:15:53 +00:00
4084889a2d
activitypub transmogrifier: remove debug code
2018-06-11 22:15:53 +00:00
1452b2823f
user: add a workaround for situations where Pleroma may believe a followee is followed
...
this was caused by lack of Undo follows in the early days, and can likely be eventually removed
2018-06-11 22:15:53 +00:00
76f80ba8c2
activitypub: when unfollowing, update the follow activity's disposition to 'cancelled' so it cannot be reused
2018-06-11 22:15:53 +00:00
a2c4a5a75b
mastodon api: allow setting an account locked or not
2018-06-11 22:15:53 +00:00
ad7188fe92
user: use Enum.uniq on the follow request query
2018-06-11 22:15:53 +00:00
f328de8eb7
activitypub transmogrifier: send Rejects in the format Mastodon wants
2018-06-11 22:15:53 +00:00
876ad6aa38
activitypub transmogrifier: send @context on accept activities
2018-06-11 22:15:53 +00:00
760eb72a38
add a bunch of stuff
2018-06-11 22:15:53 +00:00
6f89d2d583
stash api controller
2018-06-11 22:15:53 +00:00
9c88933422
implement tracking of follow requests
2018-06-11 22:15:53 +00:00
6041380774
activitypub transmogrifier: learn locked state in Update messages
2018-06-11 22:15:27 +00:00
e5206752e1
activitypub: only send accept back automatically if the account is not locked
2018-06-11 22:15:27 +00:00
3208611bfc
mix: add task for setting an account as locked or not
2018-06-11 22:15:27 +00:00
cdf5a668f2
Merge branch 'fix/mix-task-caching' into 'develop'
...
make_moderator.ex: set cache on update
See merge request pleroma/pleroma!206
2018-06-11 19:59:30 +00:00
18837c2fed
make_moderator.ex: set cache on update
2018-06-11 22:53:38 +03:00
7f79b467b1
Merge branch 'feature/domain-blocks' into 'develop'
...
Domain blocks
See merge request pleroma/pleroma!190
2018-06-11 11:19:45 +00:00
07f0cfa53f
add allow_followersonly and allow_direct options for configuring mrf_rejectnonpublic
2018-06-10 16:40:51 -07:00
4f9ecfc77a
formatting
2018-06-09 04:28:11 +00:00
8903f1ad4d
more fixes
2018-06-08 19:07:14 -07:00
16d896f526
fixes
2018-06-08 19:01:14 -07:00
b3580b6971
add option to not deny follow if blocked (fixed)
2018-06-08 18:29:41 -07:00
2847fc8f90
add option to not unfollow on block, and option to not federate outgoing blocks
2018-06-08 17:12:16 -07:00
45a935f0bd
Merge branch 'users' into 'develop'
...
Fix users lookup/return type
See merge request pleroma/pleroma!201
2018-06-08 11:10:10 +00:00
bb639a362e
Merge branch 'feature/rejectnonpublic' into 'develop'
...
Add MRF to drop all posts with "followers-only" or "direct" privacy settings
See merge request pleroma/pleroma!202
2018-06-08 11:08:50 +00:00
fa0c2727d8
Fix users lookup/return type
...
* Allow viewing user in frontend by id on pageload
2018-06-07 23:18:45 -07:00
4a16ade2ee
Merge branch 'mastopost' into 'develop'
...
Allow posting images without text in mastofe
See merge request pleroma/pleroma!194
2018-06-08 06:02:21 +00:00
e2c4013c88
s/get_by_ap_id/get_cached_by_ap_id/
2018-06-07 22:33:50 -07:00
6e7f91bf8f
final format
2018-06-07 22:14:39 -07:00
82225dfc8d
even more formatting
2018-06-07 22:10:11 -07:00
c86823f724
Merge branch 'bugfix/locked-account-regression' into 'develop'
...
security fix: locked account regression
See merge request pleroma/pleroma!200
2018-06-08 05:10:08 +00:00
990cde7439
more formatting
2018-06-07 22:03:24 -07:00
5b9e1f228a
formatting
2018-06-07 21:55:58 -07:00
f69d38e455
add mrf for dropping follower-only and direct posts
2018-06-07 21:00:57 -07:00
1e9dd6fbc2
user: fix maybe_direct_follow() after user_info() refactoring broke it slightly
2018-06-08 02:52:36 +00:00
47c7e259c4
activitypub transmogrifier: fix locked account state from being clobbered
2018-06-08 02:52:29 +00:00
a003bdc30a
activitypub transmogrifier: learn locked state in Update messages
2018-06-08 02:52:24 +00:00
839cb7b424
Merge branch 'develop' into 'mastopost'
...
# Conflicts:
# .gitignore
2018-06-07 16:29:33 +00:00
595ca3bb3a
Merge branch 'feature/quarantine' into 'develop'
...
add the ability to 'quarantine' an activitypub peer, causing them to be treated as an OStatus peer.
See merge request pleroma/pleroma!199
2018-06-07 14:44:08 +00:00
09604182d0
add the ability to 'quarantine' an activitypub peer, causing them to be treated as an OStatus peer.
2018-06-07 14:38:09 +00:00
1525a0404b
Fix follow errors
2018-06-07 00:39:24 -07:00
3f0440ac3c
Dedupe uploads
2018-06-06 13:25:44 -06:00
b4292295d7
Allow posting images without text in mastofe
2018-06-06 11:29:49 -07:00
29c9c8d93b
Extract host from ap_id, add index
2018-06-06 21:13:40 +03:00
0a0c6bf394
Merge branch 'bugfix/webfinger-xml-crash' into 'develop'
...
webfinger robustness improvements
See merge request pleroma/pleroma!195
2018-06-06 16:44:44 +00:00
1abf0f3b3e
webfinger: use https as default fallback instead of http
...
realistically, all instances need to be on https anyway to properly federate with all
software
2018-06-06 16:27:14 +00:00
aaa81d3540
XML: handle erlang errors too
2018-06-06 16:27:13 +00:00
b5d8213e70
Merge branch 'fix/oauth-http-basic' into 'develop'
...
Make OAuth token endpoint work with HTTP Basic auth
See merge request pleroma/pleroma!191
2018-06-06 08:27:08 +00:00
3607dc4558
Make token exchange return errors with 400 as status code
2018-06-06 03:14:50 +02:00
f9719b064c
Merge branch 'fix/emoji-picker' into 'develop'
...
set visible_in_picker to true in custom_emojis
Closes #177 and mastofe#16
See merge request pleroma/pleroma!188
2018-06-05 21:18:25 +00:00
73904e8f78
Make OAuth token endpoint work with HTTP Basic auth
...
client_id/client_secret can now be supplied in an Authorization header
2018-06-04 00:59:00 +02:00
9075b6d25b
ActivityPub.ex: filter domain blocked activities.
2018-06-03 23:33:33 +03:00
4856962434
MastoAPI: add domain blocking.
2018-06-03 22:21:23 +03:00
8073af6e10
Better error handling for OstatusController.
2018-06-03 21:04:44 +02:00
87566b6e2f
user.ex: add domain blocks.
2018-06-03 22:01:37 +03:00
06439f64d0
Better error handling for ActivityPubController
2018-06-03 19:58:59 +02:00
4856ba596f
Better error handling for MastodonApiController.
2018-06-03 19:28:11 +02:00
0f70e83e8c
Better error handling in TwitterApiController.
2018-06-03 19:11:22 +02:00
b143694b98
lib/pleroma/web/mastodon_api/mastodon_api_controller.ex: set visible_in_picker to true in custom_emojis
...
Fixes: https://github.com/ilianaw/emojos.in/issues/4
Closes: https://git.pleroma.social/pleroma/pleroma/issues/177
Closes: https://git.pleroma.social/pleroma/mastofe/issues/16
2018-06-03 18:41:18 +02:00
dca1d6d162
Merge branch 'fix/user-timeline-reading-user' into 'develop'
...
MastoAPI user timelines: render statuses for the logged in user.
See merge request pleroma/pleroma!187
2018-06-01 09:35:29 +00:00
8c609ee3f9
MastoAPI user timelines: render statuses for the logged in user.
2018-06-01 12:30:11 +03:00
98b8f08783
Merge branch 'fix/twitterapi-incorrect-follows-you' into 'develop'
...
TwitterAPI: fix "Follows you" being shown for the wrong user.
Closes pleroma-fe#89
See merge request pleroma/pleroma!185
2018-06-01 08:51:04 +00:00
935e544e19
TwitterAPI: fix "Follows you" being shown for the wrong user.
2018-05-31 15:27:42 +03:00
349400c06a
Fix url guessing attacks.
2018-05-30 20:00:27 +02:00
5d3fdbc082
MastoAPI: Add streaming for lists.
2018-05-30 16:48:59 +03:00
7cb2e2971e
MastoAPI: fix dm_timeline getting non-create activities.
2018-05-30 15:02:22 +03:00
35cb8969c4
MastoAPI: Fix link headers with restrictive params.
2018-05-29 13:31:36 +03:00
461f201caa
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop
2018-05-28 12:39:49 +02:00
3ece4a3ebc
Only return certain activities in TwitterAPI mentions.
2018-05-28 12:38:48 +02:00
d7eb2e1b65
run mix format
2018-05-27 13:06:38 +00:00
a8df7fc690
formatter: use class='mention' on links to user profiles
...
helps mastodon frontend and apps have better context:
https://mastodon.social/users/Gargron/statuses/100101267352899379
2018-05-27 12:56:24 +00:00
a9e36e5a64
Fix user topic streaming.
2018-05-26 21:06:46 +02:00
841ee8e3e4
Simplify DM query.
...
Should also use indexes better.
2018-05-26 16:25:32 +02:00
4b3ec53514
Merge branch 'develop' into csaurus/pleroma-feature/mstdn-direct-api
2018-05-26 16:00:59 +02:00
6138b29783
There are no symbols in JSON.
2018-05-26 15:20:21 +02:00
745072b2cc
Merge branch 'kaniini/pleroma-feature/activitypub-accept-reject-conformance' into develop
2018-05-26 15:15:52 +02:00
0a6c897c94
Formatting.
2018-05-26 15:11:50 +02:00
bfce29866f
Make Mastodon follow hack more explicit.
2018-05-26 15:07:21 +02:00
3839a11ef5
Don't treat remote accepts/rejects as local.
...
Also, use specialized functions to get safe data.
2018-05-26 14:07:46 +02:00
dd9bb37893
Rename id helper method.
2018-05-26 13:57:11 +02:00
7e873756e7
activitypub transmogrifier: use fetch_latest_follow to verify a follow object exists
2018-05-26 11:20:52 +00:00
1c926c7b60
activitypub: allow mastodon S2S block extension support to be disabled
2018-05-26 08:30:41 +00:00
e90b734f1c
debug
2018-05-26 14:10:12 +09:00
9c7da2ef48
output repeats at ActivityPub outbox
2018-05-26 14:02:57 +09:00
7cf3cf77cf
activitypub transmogrifier: cleanups and tests for incoming accepts/rejects
2018-05-25 12:53:12 +00:00
f35e6bf75b
activitypub transmogrifier: clean up accept/reject handling a bit
2018-05-25 09:40:11 +00:00
e80d91c64a
introduce User.maybe_direct_follow() and use it where we used to call User.follow()
2018-05-25 09:40:10 +00:00
c89b90222c
twitter api: also remove explicit User.follow here
2018-05-25 09:40:06 +00:00
62c95e8d4d
run mix format
2018-05-25 09:39:46 +00:00
5d6d86bf00
Merge branch 'feature/blocks-deny-refollow' into 'develop'
...
activitypub conformance: deny refollow for blocks
See merge request pleroma/pleroma!170
2018-05-25 07:15:01 +00:00
502ba33d01
activitypub: fix up accept/reject semantics for following
...
fixes #175
2018-05-25 06:14:18 +00:00
c0ca9f82b9
mastodon api: properly track if an account is locked or not
2018-05-25 06:14:09 +00:00
47dc52a758
activitypub utils: optimize block and follow activity lookup
...
multi-field @> comparison is very expensive, so only use @> for the field where it matters
this makes the query take only a few usec to execute verses many msec on a busy instance
2018-05-25 05:23:49 +00:00
1d88abf2d4
user: do not allow refollowing somebody who has blocked a user
2018-05-25 03:18:35 +00:00
f3a71f2986
Merge branch 'feature/lists' into 'develop'
...
Mastodon List API
See merge request pleroma/pleroma!138
2018-05-24 20:22:43 +00:00
c2dcd767cf
Merge branch 'feature/incoming-remote-unfollow' into 'develop'
...
Add support for incoming remote unfollows and blocks/unblocks
See merge request pleroma/pleroma!158
2018-05-24 19:52:24 +00:00
1197ec10a8
Rewrite block fetch query
2018-05-24 13:26:59 -04:00
c41012053a
Merge branch 'feature/change-password' into 'develop'
...
Feature/change password
See merge request pleroma/pleroma!166
2018-05-24 17:16:37 +00:00
3dbd9809d4
MastoAPI: add lists.
2018-05-24 15:34:39 +03:00
1cd6194dee
More efficient queries.
2018-05-24 12:44:26 +02:00
a8369db4f2
MastoAPI: add lists.
2018-05-24 13:18:39 +03:00
0b5bc62b33
Don't save double tags in AP objects we create
...
This crashed Mastodon workers.
2018-05-23 17:25:24 +02:00
06c97f211f
Merge branch 'feature/deps-migration' into 'develop'
...
Migrate to comeonin 4 and Cachex 3
See merge request pleroma/pleroma!162
2018-05-23 09:03:11 +00:00
72b93d13f8
Hook up block/unblock to TwitterAPI
2018-05-22 05:41:17 -04:00
55f9aefd08
Hook unfollow into TwitterAPI
2018-05-22 04:49:30 -04:00
b2c6ae7d82
Hook up unfollow and (un)block to MastoAPI + tests
2018-05-22 04:27:40 -04:00
4fd9df100f
Merge branch 'develop' into feature/mstdn-direct-api
2018-05-21 20:19:37 -04:00
d0690622cd
Added endpoint for changing passwords
2018-05-21 23:06:03 +01:00
b4064dfe30
Merge branch 'feature/clarify-http-sig-error' into 'develop'
...
clarify HTTP signature error in logs
See merge request pleroma/pleroma!165
2018-05-21 21:20:41 +00:00
9a2d097ed8
activitypub controller: note that the HTTP Host header must be forwarded for http signature validation to work
2018-05-21 19:22:30 +00:00
46427cb90f
Pass correct number of arguments to unfollow
2018-05-21 11:57:15 -04:00
75cfd9d34d
webfinger: fix finding the XRD uri for statusnet instances
2018-05-21 12:41:31 +00:00
d269c69a0b
Actually fix missing alias.
2018-05-21 12:32:29 +02:00
bf64208b52
Add missing alias.
2018-05-21 12:09:03 +02:00
d045b96f95
Add tests for incoming unfollow over OStatus
2018-05-21 05:11:13 -04:00
cc5373b846
Fix unblock handling
2018-05-21 05:00:58 -04:00
f2d6c3a512
Handle unfollows from OStatus
2018-05-21 04:36:20 -04:00
2573332214
Add undo block handler
2018-05-21 04:35:43 -04:00
c8a16f334d
Format
2018-05-20 21:02:06 -04:00
89c5de9096
Fix unfollows
2018-05-20 21:01:14 -04:00
1afd6d37bd
Merge remote-tracking branch 'upstream/develop' into feature/incoming-remote-unfollow
...
Fixed some conflicts in transmogrifier.ex
2018-05-20 19:17:15 -04:00
e55c6f311b
Migrate to comeonin 4 and Cachex 3
...
Also fix some warning in the code and add a missing alias
2018-05-20 20:08:40 +02:00
dca26f3655
Fix specs.
2018-05-20 19:22:26 +02:00
ff007af0c2
Return visilility in twitter api, too.
2018-05-20 18:01:24 +02:00
434601a5c3
Return private / direct posts on user timelines, too.
2018-05-20 16:15:18 +02:00
8b0c222b43
Merge branch 'feature/account-deletion' into 'develop'
...
Feature/account deletion
Closes #115
See merge request pleroma/pleroma!157
2018-05-20 10:57:19 +00:00
a9141d88aa
Pass user instead of their ap_id to User.block
2018-05-19 22:02:13 -04:00
3b706ea493
Remove handler for incoming undos with object references
2018-05-19 21:34:30 -04:00
1e43de0f86
Formatting and add tests for blocks/unblocks
2018-05-19 21:23:52 -04:00
da9744eb84
Use correct variable names in unfollow
2018-05-19 20:57:37 -04:00
6f39ecc41b
Support Undo like activities ( Fix #139 )
2018-05-19 22:14:15 +02:00
d1366f8d46
Modified deleting an account to run as a task
2018-05-19 13:35:49 +01:00
7831b38705
Merge branch 'feature/webfinger-mime-ld-json' into 'develop'
...
webfinger: handle application/ld+json links
See merge request pleroma/pleroma!159
2018-05-19 09:31:08 +00:00
ad563669c8
Merge branch 'feature/remote-user-deactivation' into 'develop'
...
remote user deactivation
See merge request pleroma/pleroma!154
2018-05-19 09:30:09 +00:00
df95118c81
Fix linking problem.
2018-05-19 11:27:14 +02:00
725b05d04a
run mix format
2018-05-19 08:48:15 +00:00
6e8de2faae
run mix format
2018-05-19 08:37:04 +00:00
2051530868
activitypub transmogrifier: handle hubzilla AP actor quirks
2018-05-19 03:28:29 -05:00
4d2c6707c2
activitypub: normalize the actor to ensure we have its URI
2018-05-19 03:28:28 -05:00
1a250d65af
webfinger: only do ld+json on modern json webfinger
2018-05-19 01:28:19 -05:00
d1f6ecf607
webfinger: interpret application/ld+json links as an alternate to application/activity+json
2018-05-19 01:28:12 -05:00
cce5a9cb1c
webfinger: expose the application/ld+json link alongside the older application/activity+json link
2018-05-19 01:28:03 -05:00
13d4b6d2b5
remote user deactivation: fix test failures
2018-05-19 01:26:13 -05:00
0ec1abb3b6
Add federated blocks
2018-05-18 18:09:56 -04:00
6604bea9d0
actually rvert those changes
2018-05-17 23:56:47 -04:00
8d11bae0d5
Revert "Undo formatting in user.ex"
...
This reverts commit e6dc15b96c
2018-05-17 23:55:00 -04:00
e6dc15b96c
Undo formatting in user.ex
2018-05-17 23:53:34 -04:00
d8c842a771
Add support for incoming remote unfollows
2018-05-17 22:15:57 -04:00
1d4bbec6b3
Fix User search.
...
Now uses a trigram based search. This is a lot faster and gives better
results. Closes #185 .
2018-05-16 17:55:20 +02:00
4dfb40a546
Handle cases where a to/cc field is absent on a status
2018-05-14 21:54:25 -04:00
a6a6915aaf
add mix task for deactivating a user by nickname
2018-05-13 19:05:03 -05:00
9390492138
ActivityPub create: discard activities from deactivated users
2018-05-13 19:05:02 -05:00
2ce48c1a42
Formatting
2018-05-13 15:36:41 -04:00
9aabff4883
Fix tests.
2018-05-13 15:33:59 -04:00
98b36d359a
Fixed formatting and test
2018-05-13 15:43:42 +01:00
5bfb7b4ce6
Moved account deletion stuff to somewhere that hopefully makes more sense
2018-05-13 14:36:02 +01:00
a16117225f
Added endpoint for user account deletion
2018-05-13 14:35:48 +01:00
c7a85de35c
Revert "Remove 'unlisted' handling for now."
...
This reverts commit 1027d1f696
2018-05-13 12:38:13 +02:00
1027d1f696
Remove 'unlisted' handling for now.
...
It's just too slow (over 1 second on small systems, haven't looked at
the queries in detail yet). We'll need some other way to handle it.
2018-05-13 12:07:11 +02:00
a5c9dd0a2a
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop
2018-05-13 11:59:35 +02:00
3c3933e40b
Unlisted fetching: Reverse logic
...
Generates a faster query.
2018-05-13 11:58:03 +02:00
aeff2d6474
Merge branch 'feature/unrepeats' into 'develop'
...
Add unrepeats
Closes #69
See merge request pleroma/pleroma!113
2018-05-13 09:32:29 +00:00
ec531ca281
Add test.
2018-05-13 11:18:48 +02:00
29376fcc13
Format.
2018-05-13 10:56:44 +02:00
76722ea9c8
Merge branch 'develop' into kaniini/pleroma-bugfix/unlisted-statuses
2018-05-13 10:56:11 +02:00
4ad5e72012
Merge branch 'feature/chain-policies' into 'develop'
...
chain policies
See merge request pleroma/pleroma!150
2018-05-13 08:24:18 +00:00
54ccbd8479
Use original status id instead of announce id
2018-05-13 03:42:31 -04:00
c8d418acdd
api/v1/timelines/direct implementation
2018-05-12 21:50:59 -04:00
392bd9ef56
Stream function to handle direct messages.
2018-05-12 17:40:59 -04:00
c60a5405db
Detect and try to stream incoming "direct" messages
2018-05-12 17:40:59 -04:00
4d88747561
Revert "Log error when handling unrepeats"
...
This reverts commit c17c55e989
2018-05-11 15:34:46 -04:00
c17c55e989
Log error when handling unrepeats
2018-05-11 15:29:19 -04:00
271fb5ccb1
Probably better way of handling non-follow undos in ostatus
2018-05-11 11:59:53 -04:00
4151cbe6b2
Revert "Do not send non-follow undos over ostatus for now"
...
This reverts commit 07fdc07238
2018-05-11 11:53:28 -04:00
0b527b5528
Revert "Use [] instead of nil"
...
This reverts commit 42268b0981
2018-05-11 11:53:06 -04:00
89603eda9e
do not create notification for yourself
2018-05-11 11:31:17 +02:00
42268b0981
Use [] instead of nil
2018-05-11 01:48:56 -04:00
07fdc07238
Do not send non-follow undos over ostatus for now
2018-05-11 01:45:10 -04:00
c220a6db43
format & made get_policies/1 private
2018-05-10 18:51:58 +02:00
e9e6f37bda
Chain policies
...
- The `:pleroma, :instance, :rewrite_policy` can now be either a policy
or a list of policies
- Made a behaviour for MRF policies
2018-05-10 18:41:06 +02:00
900c735467
Match proper number of values from unannounce
2018-05-09 00:04:14 -04:00
54f6628590
Change argument order and call correct # of args
2018-05-08 23:59:36 -04:00
e55f69a676
Handle Undo activites containing an Announce
2018-05-08 23:50:19 -04:00
4d5ec883b7
Federate correct activity
2018-05-08 21:52:21 -04:00
ffe028cd73
More warning fixes.
2018-05-07 18:11:37 +02:00
6c2903d9a1
Merge branch 'feld-warnings' into 'develop'
...
Clean up warnings
See merge request pleroma/pleroma!144
2018-05-06 18:42:31 +00:00
bfad57c7c9
Get rid of unsafe variables.
2018-05-06 09:58:59 +03:00
9810153aeb
Streamer: Don't send out stream events for blocked users.
2018-05-05 13:40:47 +02:00
96add86b50
Unify wss uri generation.
2018-05-05 13:40:31 +02:00
c464355d1a
Idempotency: Use special cache, keep for 6 hours.
2018-05-05 11:15:57 +02:00
Mark Felder
7a884d70d8
Group def renders here as well
2018-05-04 22:31:46 +00:00
Mark Felder
31ea9cbcd8
Group def renders together to fix warning
2018-05-04 22:28:13 +00:00
Mark Felder
14c0c6d16b
Fix formatting
2018-05-04 22:03:14 +00:00
Mark Felder
2a402fb395
Group response declarations together
2018-05-04 21:59:21 +00:00
Mark Felder
a24eed0f57
That last change was stupid. Multiline comments in Elixir don't really exist.
...
Instead we'll just pad with # intstead of playing stupid games with the compiler.
2018-05-04 21:53:52 +00:00
Mark Felder
79d41aa12e
Dirty hack to remove the warning
...
warning: code block contains unused literal "internal -> Mastodon\n" (remove the literal or assign it to _ to avoid warnings)
lib/pleroma/web/activity_pub/transmogrifier.ex
2018-05-04 21:48:30 +00:00
Mark Felder
aaacebd906
Fix unused variables, imports, and aliases
2018-05-04 21:42:20 +00:00
Mark Felder
42f1a098aa
Fix build. Too eager with the fixing of unused variables.
...
== Compilation error in file lib/pleroma/web/activity_pub/views/user_view.ex ==
** (CompileError) lib/pleroma/web/activity_pub/views/user_view.ex:54: undefined function _total/0
(stdlib) lists.erl:1338: :lists.foreach/2
(stdlib) erl_eval.erl:670: :erl_eval.do_apply/6
2018-05-04 21:26:33 +00:00
Mark Felder
636f0fa402
Clean up unused aliases and imports
2018-05-04 21:25:31 +00:00
Mark Felder
943820ae29
More unused variables
2018-05-04 21:16:02 +00:00
Mark Felder
ab4aa5720a
Fix a bunch of unused variable warnings
2018-05-04 20:59:01 +00:00
11a1241d41
Merge branch 'feature/nodeinfo' into 'develop'
...
Implements the nodeinfo endpoints
See merge request pleroma/pleroma!140
2018-05-04 19:17:19 +00:00
90c4bed0af
Don't expire idempotency cache for five minutes.
2018-05-04 21:15:39 +02:00
fcd3eca167
MastodonAPI: Support idempotency key.
2018-05-04 20:30:29 +02:00
c3f9e24c70
Use a variable for stats to avoid double call
2018-05-03 15:31:39 +02:00
724f096ac7
Add metadata.nodeName
2018-05-03 10:52:20 +02:00
804497542d
Return the right content-type for the schema call
2018-05-03 10:50:02 +02:00
e448734952
Explicit error message
2018-05-02 22:45:20 +02:00
fd0bf3aa71
Simplify version and fix typo
2018-05-02 22:44:13 +02:00
b8789cc8b6
Add localPosts count, also set to 0 if null
2018-05-02 22:36:19 +02:00
abeb009acc
Change path of nodeinfo to use .json format
2018-05-02 22:16:19 +02:00
65168393d8
Format files
2018-05-02 21:43:12 +02:00
67dadd954e
Add first try at nodeinfo
2018-05-02 21:31:42 +02:00
bc215f5684
Fix format.
2018-04-29 11:28:26 +02:00
b7584edcea
Merge branch 'patch-bio' into 'develop'
...
replace newlines in profiles with <br>
See merge request pleroma/pleroma!136
2018-04-29 09:26:47 +00:00
a3d1d4894f
ActivityPub core: fix handling of unlisted statuses by leveraging a similar strategy as for blocks
2018-04-28 22:32:46 -05:00
4d55d7c95e
Insert object after being rewritten.
2018-04-28 16:10:24 +02:00
a7a40bb8f1
Merge branch 'fix/blocked-user-boosts' into 'develop'
...
ActivityPub.ex: do not return boosted statuses from blocked users.
See merge request pleroma/pleroma!111
2018-04-28 13:49:12 +00:00
634c0c52a1
Merge remote-tracking branch 'upstream/develop' into patch-bio
2018-04-28 11:59:01 +01:00
39c80a3667
Merge branch 'bugfix/mrf-simple-media-stripping' into 'develop'
...
ActivityPub MRF SimplePolicy: fix media stripping
See merge request pleroma/pleroma!133
2018-04-27 05:49:12 +00:00
90bbd94614
ActivityPub MRF SimplePolicy: fix media stripping
2018-04-25 16:28:53 -05:00
845bd56c9c
Merge branch 'patch-1' into 'develop'
...
Fix typo in MastoFE login page.
See merge request pleroma/pleroma!132
2018-04-25 14:35:44 +00:00
a7eb148d61
Optionally deactivate public timelines.
2018-04-25 16:11:07 +02:00
279b1d19f0
Align local bio limits to remote limit.
2018-04-25 15:41:59 +02:00
2d775bf1be
Merge branch 'feature/unrepeats' of git.pleroma.social:normandy/pleroma into feature/unrepeats
2018-04-25 01:58:50 -04:00
9e0dd21ed6
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into feature/unrepeats
2018-04-25 00:46:28 -04:00
0df1a4efc8
Fix comment grammar
2018-04-25 00:46:06 -04:00
715c90e54f
Fix typo in MastoFE login page.
...
see https://git.pleroma.social/pleroma/mastofe/issues/13
2018-04-24 21:58:45 +00:00
c78e7d8b11
Fix formatting.
2018-04-24 21:25:31 +02:00
7a52c4549c
Merge branch 'feature/message-rewrite-facility' into 'develop'
...
message rewrite facility
See merge request pleroma/pleroma!112
2018-04-24 17:21:28 +00:00
7517155544
Changed to support \r\n and \n
2018-04-24 13:28:55 +01:00
52ee91efce
Patch to replace newlines with <br> tags in bio
2018-04-24 13:20:17 +01:00
afe892ddac
Correct syntax with mix format
2018-04-24 14:12:23 +02:00
9972678a68
Add User.decrease_note_count and call it from ActivityPub.delete
2018-04-24 11:34:18 +02:00
62a2287bba
Merge branch 'favicon_tag' into 'develop'
...
Fix endpoint for favicon
See merge request pleroma/pleroma!84
2018-04-24 05:54:28 +00:00
8c0806539c
Embed announce activity data instead of linking to it
2018-04-22 21:28:51 -04:00
b1742eca42
Revert "Rename make_unannounce_data helper to make_undo_data"
...
This reverts commit c649ca8958
2018-04-22 19:42:28 -04:00
0574df273c
Small cleanup.
2018-04-22 10:01:10 +02:00
114ca9e069
Merge branch 'develop' into fix/note-count-not-updating
2018-04-22 09:56:24 +02:00
c649ca8958
Rename make_unannounce_data helper to make_undo_data
...
This makes it a bit more easier to adapt for unlikes as well in the
future.
2018-04-22 01:55:41 -04:00
0c221943ef
Formatter: Use proper escaping for links.
2018-04-21 18:27:31 +02:00
22bfeac256
Update note count in ActivityPub.create.
2018-04-21 12:58:04 +03:00
9e6ae44729
Formatting fixes.
2018-04-21 09:43:53 +02:00
ff5e957476
Make search use id index too.
...
Seems to be faster in general, query planner chooses well.
2018-04-21 09:22:31 +02:00
f0798440de
Use correct activity for undo
2018-04-20 23:22:16 -04:00
4b9f2ab526
Fix federation of unreblog activity
2018-04-20 23:09:19 -04:00
c5dc7e6e31
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into feature/unrepeats
2018-04-20 16:48:18 -04:00
a61e8ac154
Formatting.
2018-04-20 13:10:57 +02:00
193be32f45
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop
2018-04-19 21:44:29 +02:00
0b4ff1bfe2
fix again
2018-04-19 21:44:11 +02:00
fa37acfcc7
TwitterAPI: Add Qvitter notification endpoint.
2018-04-19 21:46:59 +03:00
f08f9d4498
ActivityPub MRF: fix nsfw tagging of objects with attachments by looking at the right object (the child in this case)
2018-04-19 07:45:09 -05:00
7b96a756fb
fix again
2018-04-19 13:04:29 +02:00
77fc40d5d7
Fix generate config
2018-04-19 12:52:24 +02:00
e30a056476
Revert "Ask for proxy URL if proxy enabled."
...
The most common case is running it on the same server.
2018-04-19 13:29:14 +03:00
32a26eb910
Fix TwitterAPI.delete call
2018-04-18 20:43:03 -04:00
ee6f15529d
CommonAPI post: kill \r with fire
2018-04-18 15:46:39 -05:00
b586ead6b8
rm_user: also ensure that cache is running.
2018-04-18 17:52:25 +03:00
8b5ea91f68
Merge branch 'fix/rm-user-task' into 'develop'
...
Fix rm_user task.
See merge request pleroma/pleroma!119
2018-04-18 14:41:03 +00:00
4e3fc530db
Fix rm_user task.
2018-04-18 17:39:27 +03:00
947431e9aa
MastoAPI and OAuth: allow login with either email or username.
2018-04-18 13:13:57 +03:00
7b4f55238e
Handle unrepeats via the TwitterAPI
2018-04-18 06:00:40 -04:00
687db1bc3a
Expose unannounce activity so that it can be tested
2018-04-18 03:39:42 -04:00
0251690e96
Add federation for unrepeats
2018-04-17 20:35:07 -04:00
c9e7b984d5
Add make_unannounce_data helper function
2018-04-17 04:13:08 -04:00
85bd191291
Remove unretweet function for now
2018-04-17 04:12:16 -04:00
42279f54cf
Return target status in MastoAPI endpoint instead of reblog activity
2018-04-16 23:30:52 -04:00
d16877251a
doc fixes
2018-04-16 10:59:32 -04:00
b949577472
Add unrepeat functionality
2018-04-14 20:19:48 -04:00
d24ddd9fb9
ActivityPub MRF: implement the SimplePolicy policy
2018-04-14 06:32:45 -05:00
4a178b3d65
ActivityPub: implement MRF core hook and baseline noop policy object
2018-04-14 06:32:44 -05:00
48380aeccc
ActivityPub.ex: do not return boosted statuses from blocked users.
2018-04-14 14:26:20 +03:00
13a64b82e3
Switch to User.delete for rm_user task
2018-04-12 14:30:53 -04:00
4478b9115c
Add rm_user mix task
2018-04-12 02:43:48 -04:00
907df9b8ed
Fix issue #124
2018-04-11 14:55:49 -04:00
b910483c16
Fix register_user task.
2018-04-10 21:05:53 +02:00
1dd2c8163f
Order masto searches by date.
2018-04-10 18:38:52 +02:00
d7c2909ce2
Merge branch 'bugfix/user-search-with-at-sign' into 'develop'
...
user: strip leading @ from user query when searching for users if present
Closes #117
See merge request pleroma/pleroma!99
2018-04-09 08:42:01 +00:00
2edde06042
user: strip leading @ from user query when searching for users if present
...
closes #117
2018-04-09 02:42:37 -05:00
9998b4519d
Merge branch 'feature/mastodon-api-for-tootstream' into 'develop'
...
mastodon api emulation improvements for tootstream
Closes #101
See merge request pleroma/pleroma!100
2018-04-08 06:02:11 +00:00
9a2d3705c6
Merge branch 'fix/persisted-mastofe-settings' into 'develop'
...
MastoAPI: Persist frontend timelines and settings.
Closes #113
See merge request pleroma/pleroma!98
2018-04-08 06:01:06 +00:00
1857f403be
mastodon api: report version as the Mastodon API version supported with the real version in parenthesis
2018-04-07 17:29:28 -05:00
52a1a40d7d
mastodon api: implement /api/v1/lists stub
2018-04-07 17:29:27 -05:00
8f9bcc4ab0
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop
2018-04-07 16:41:47 +02:00
70bcdf32bd
Only search in public data for now.
...
This should be the data the user is allowed to see later, but this
will stop accidental private message leaks.
2018-04-07 16:40:45 +02:00
7c47534970
MastoAPI: Persist frontend timelines and settings.
2018-04-07 17:26:56 +03:00
d41bfd1d47
Merge branch 'bugfix/html-webfinger-host-meta' into 'develop'
...
webfinger: handle situations where the well-known endpoint returns HTML
See merge request pleroma/pleroma!94
2018-04-07 12:19:49 +00:00
e7ddda44c0
Follow import: allow URI in addition to screen_name.
2018-04-07 15:00:23 +03:00
bf9d3d4aba
XML: use try/catch with XPath functions
2018-04-06 22:56:09 -05:00
60f92e406c
Accept port number in urls.
2018-04-06 16:35:54 +02:00
303289d7da
MastodonAPI search: return only create activities.
2018-04-05 13:59:53 +02:00
033771d9f1
Fix failure to serve media from custom upload path
2018-04-05 11:46:33 +01:00
d70d1c427a
TwitterAPI: Don't put follows into the public tls.
2018-04-04 15:23:27 +02:00
81600c94f4
Handle + in links.
2018-04-04 11:29:03 +02:00
806550c921
Use user url in mention if we have it.
2018-04-03 18:32:46 +02:00
b3b7ab5d9a
Load all users at once in timelines.
2018-04-02 16:35:41 +02:00
96007753ad
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop
2018-04-02 15:29:05 +02:00
360c51f1f5
Use context_ids directly if we have them.
2018-04-02 15:28:35 +02:00
bc31bee7c4
Generates contexts and ids on insertion time.
2018-04-02 15:17:09 +02:00
a4db3a732f
Pre-fetch conversation ids.
2018-04-02 14:46:56 +02:00
807d243c64
Merge branch 'fix-107' into 'develop'
...
masto api: run emojis through mediaproxy
Closes #107
See merge request pleroma/pleroma!92
2018-04-02 11:24:12 +00:00
cd543d58a1
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop
2018-04-02 13:15:38 +02:00
0a14d155d6
Fail faster.
2018-04-02 13:13:14 +02:00
1b57522bba
Fix some test stuff.
2018-04-02 13:13:04 +02:00
5e4bb4ad92
masto api: run emojis through mediaproxy
...
fixes #107
2018-04-02 12:04:11 +02:00
978df55a86
Merge branch 'feature/mastodon-search-tags' into 'develop'
...
mastodon search api: implement a reasonable hashtags stub
See merge request pleroma/pleroma!89
2018-04-01 08:37:45 +00:00
b3d67750f0
Fix conflict
2018-04-01 16:58:35 +09:00
2dcc6037d0
mastodon search api: implement a reasonable hashtags stub
2018-04-01 02:12:10 -05:00
4bf86d4cf5
config: make the upload limit configurable
2018-03-31 19:53:23 -05:00
5fa8237bc1
Merge branch 'new-mastofe' into 'develop'
...
Bring Mastodon frontend up-to-date
See merge request pleroma/pleroma!87
2018-03-31 19:33:17 +00:00
86525e3a34
Use correct linefeed.
2018-03-31 21:14:33 +02:00
1b03981783
Small fix.
2018-03-31 21:11:46 +02:00
94bbe1addc
Fix typo.
2018-03-31 21:10:56 +02:00
8cbda7c0ee
Modify newlines.
2018-03-31 21:09:58 +02:00
fe1dcf0027
Remove inspect.
2018-03-31 21:02:54 +02:00
9f45e33ae8
Proper info.
2018-03-31 21:00:23 +02:00
ae6e3cb981
No tabs.
2018-03-31 20:48:04 +02:00
2222e5599c
Don't fetch anything except ap_id for follower / following
...
collections.
Should speed up the queries because ecto doesn't have to parse the json.
2018-03-31 20:02:09 +02:00
57b24b2cba
Gopher: Add like / repeat count.
2018-03-31 20:01:55 +02:00
7f2174d811
Remove pl-dark-masto-fe, add preloading for common scripts
2018-03-31 19:14:47 +02:00
4e5aa3b3a0
Add gopher server.
2018-03-31 18:12:20 +02:00
802736679c
Remove unused ActivityRepresenter module.
2018-03-30 16:50:30 +02:00
7ab94ae22d
TwitterApiController: Use ActivityView.
2018-03-30 16:30:16 +02:00
e90f8f6c4b
TwApi ActivityView: Add delete activities.
2018-03-30 15:32:43 +02:00
1f32ba052c
TwApi ActivityView: Add follows.
2018-03-30 15:17:13 +02:00
4afbef39f4
Format the code.
2018-03-30 15:01:53 +02:00
480932c8e5
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop
2018-03-30 14:48:08 +02:00
c1d529ee94
TwApi ActivityView: Add announces.
2018-03-30 14:46:36 +02:00
1f1caab138
TwApi ActivityView: Add Like rendering.
2018-03-30 13:49:09 +02:00
675839e13c
Fix TwApi reply visibility.
2018-03-30 12:19:57 +02:00
457e040473
Add char_limit to initial-state of mastofe
2018-03-30 00:59:49 +02:00
df8fc72491
Don't go through all available emoji.
...
object carry their emoji information.
2018-03-28 09:56:32 +02:00
e30752bc79
Add basic activity view.
2018-03-27 22:24:19 +02:00
37e5014d3e
Reduce OP fetching queries.
2018-03-27 18:18:24 +02:00
ff7afe46b9
Don't try to fetch OP if none is there.
2018-03-27 17:43:08 +02:00
d2099c849d
More Jason changes.
2018-03-27 16:45:38 +02:00
527e803758
Add missing types.
2018-03-27 16:10:41 +02:00
fbc187ac15
Switch to Jason for json handling.
...
It's twice as fast and will be the standard in the coming ecto.
2018-03-27 16:09:08 +02:00
61692c7efa
Include the '#' symbol into the link itself
2018-03-27 02:00:04 -04:00
bd4926288e
Speed up follower query.
2018-03-26 10:31:22 +02:00
46f63ea8af
Fix atom feed pagination.
2018-03-26 09:51:43 +02:00
2c1c221301
Fix follower collection id.
2018-03-25 19:34:33 +02:00
09de76ad5a
Return "audio" info in mastodon api.
2018-03-25 17:08:54 +02:00
809bffbb21
Merge branch 'feature/oauth-token-password' into 'develop'
...
oauth: implement grant_type=password for single-page apps
See merge request pleroma/pleroma!81
2018-03-25 13:40:06 +00:00
aa19fdef00
Fix favicon and add to index.html
2018-03-25 19:58:12 +09:00
2aea3bc632
activitypub transmogrifier: rewrite incoming hashtags
2018-03-24 16:42:17 -05:00
847cb15626
Fix tests.
2018-03-24 15:09:09 +01:00
c7be7a9454
Unify user fetching.
2018-03-24 15:02:43 +01:00
e3a81fe58f
Fetch the same data from json webfinger as from xml webfinger.
2018-03-24 14:45:54 +01:00
eb7ce61ca5
Fix hashtags.
2018-03-24 11:03:10 +01:00
dd21137f38
oauth: implement grant_type=password for single-page apps
2018-03-23 15:53:58 -05:00
fbe9aa3506
Strip html from emoji stuff.
2018-03-23 19:52:08 +01:00
5da2355e71
For outgoing objects, fake mastodon style ap id for ostatus.
2018-03-23 16:07:02 +01:00
b72a25f5b1
Merge branch 'develop' into kaniini/pleroma-feature/activitypub-endpoints
2018-03-22 12:48:56 +01:00
f9ab38a443
Fix test.
2018-03-22 12:37:24 +01:00
4d3af2af71
webfinger: implement json response parsing
2018-03-22 00:36:12 -05:00
1decd2ecb2
webfinger: attempt to fall back if LRDD template cannot be found
2018-03-22 00:36:01 -05:00
8aa639a450
webfinger: support JSON output
2018-03-22 00:35:51 -05:00
3fcdfb75d0
activitypub: add outbox endpoint
2018-03-22 00:26:54 -05:00
381ba256bf
activitypub: add restrict_limit
2018-03-22 00:26:47 -05:00
1a94704230
activitypub: implement following/followers endpoints
2018-03-22 00:26:39 -05:00
c50c7745bc
Fetch relayed messages from source while we don't have linked data sigs.
2018-03-21 07:12:14 +01:00
9b97b023c5
Merge branch 'feld-Logger' into 'develop'
...
Logging cleanup
See merge request pleroma/pleroma!76
2018-03-20 05:57:47 +00:00
16d102c153
Clarify that this error is about a problem decoding the expected JSON
...
payload
2018-03-19 18:18:52 +00:00
96cfc67e05
LRDD, you are special and we love you too
2018-03-19 18:05:53 +00:00
2702df489f
cap again
2018-03-19 18:00:02 +00:00
2549a73d6d
start with a capital
2018-03-19 17:58:45 +00:00
185c030258
AP again
2018-03-19 17:57:58 +00:00
9a858621d6
AP and WebFinger need love here
2018-03-19 17:56:49 +00:00
8d561f952f
Make XML feel special too
2018-03-19 17:51:31 +00:00
032ed2b945
This log message was do do 💩
2018-03-19 17:47:51 +00:00
4190abbf27
Another WebSub CamelCase
2018-03-19 17:46:53 +00:00
7430ff9173
Capitalize Atom
2018-03-19 17:44:25 +00:00
7f77433c0e
CamelCase WebSub in log messages
2018-03-19 17:41:04 +00:00
25279dba77
Capitalize start of log message
2018-03-19 17:39:12 +00:00
0cf6f7a54d
capitalize Salmon protocol name
2018-03-19 17:38:54 +00:00
04395cb9bd
Grammar consistency
...
Most log messages are sentence fragments so make them consistent by
removing periods. Log messages that are expressing urgency with ! or
pending more work with "..." are OK.
2018-03-19 17:31:58 +00:00
402e775a80
ap -> AP for consistency
2018-03-19 17:28:06 +00:00
ec83175100
Use connection pools.
2018-03-19 17:42:09 +01:00
4d5161b16d
Only fetch if it's http.
2018-03-19 10:28:28 +01:00
000b3f1837
mastodon api: fix rendering the mentions JSON
...
Signed-off-by: lain <lain@soykaf.club>
2018-03-16 11:25:41 +01:00
59a76ea464
activitypub transmogrifier: rewrite non-http URLs using the object's external URL
...
Signed-off-by: lain <lain@soykaf.club>
2018-03-14 08:53:29 +01:00
68aa9a2826
Do more jobs by default.
2018-03-13 18:33:08 +01:00
0067c9d2be
Only push to still valid websub subscriptions.
2018-03-13 18:32:17 +01:00
2b2fa94e94
Move stuff around.
2018-03-13 14:58:49 +01:00
36f615135f
A small patch to show the instance name and favicon in the browser title
...
bar.
2018-03-13 09:37:55 +00:00
30d65639c1
Fix Mastodon emojis.
...
Code by Kaniini
2018-03-13 08:05:43 +01:00
312a8783f8
Ignore incoming empty chat messages.
...
Fixes #62 .
2018-03-12 11:30:12 +01:00
368e085144
Don't validate on missing public key.
2018-03-11 14:47:37 +01:00
a9f78fe8e0
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop
2018-03-11 14:43:53 +01:00
f29902a241
More signature debugging.
2018-03-11 14:37:23 +01:00
18e1202a3b
MastoAPI: Add unimplemented status card endpoint.
2018-03-09 20:58:00 +02:00
2e32012d57
Add next and previous headers to user pages and tag timelines.
2018-03-09 16:54:10 +02:00
ff7bc16a7e
Restrict activity fixing more.
...
If we need it for older ones, we can add a task for that later.
2018-03-08 19:09:46 +01:00
611ca385de
Merge branch 'develop' into feature/activitypub
2018-03-08 12:37:06 +01:00
8228ae96d8
Only run the fix-up tasks once.
2018-03-07 20:19:48 +01:00
fcf1937a40
Correctly handle unlisted messages coming in through Ostatus.
2018-03-07 15:45:13 +01:00
b82637f32d
Don't use special query for feed.
2018-03-06 16:04:29 +01:00
0f2bf3eefb
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop
2018-03-05 09:27:08 +01:00
0e20d5529a
Add way to disable federation.
2018-03-05 09:26:24 +01:00
d2ad99298e
Handle incoming deletes.
2018-03-03 18:38:40 +01:00
1377b2e569
Restrict public by recipients.
...
This is much faster than going through the json. This does break
unlisted, for which we'll probably have to add another table field.
2018-02-26 10:09:30 +01:00
a17ba0ee0d
Only return posts in TwAPI user view.
2018-02-26 09:02:14 +01:00
82df16f7c3
Actual real fix.
2018-02-25 22:28:53 +01:00
0d69bbc1fb
One more fix.
2018-02-25 22:20:38 +01:00
8c712b3198
Fix context stitching.
2018-02-25 21:42:28 +01:00
e1b0ccce77
Mastodon API context fix.
2018-02-25 21:25:33 +01:00
e9de04b74b
Add support for outgoing update.
2018-02-25 21:08:32 +01:00
5ea6d96dbe
Fix signing bug.
2018-02-25 20:15:04 +01:00
f61fd00db5
Make likes and announces public.
2018-02-25 18:20:06 +01:00
8a47974217
Fix specs.
2018-02-25 18:11:03 +01:00
4ea2a41014
Fix more specs.
2018-02-25 17:48:31 +01:00
d3b0167854
Fix salmon tests.
2018-02-25 17:06:12 +01:00
4d13cc0dc6
Fix specs.
2018-02-25 16:52:33 +01:00
8e7f63afde
Fix specs.
2018-02-25 16:40:37 +01:00
dfaddeb765
Use update_and_set cache.
2018-02-25 16:34:24 +01:00
e3629af4da
Handle remote update activities.
2018-02-25 16:14:25 +01:00
dd97193311
Set conversation to parent conversation.
2018-02-25 13:35:08 +01:00
b76de1ecd3
Some fixes to AP fetching.
2018-02-25 10:56:01 +01:00
0e9bd6d148
Hotfix for tag problems.
2018-02-24 22:28:22 +01:00
7e0ce32f4d
Fix external url in twitterapi.
2018-02-24 20:29:57 +01:00
82e34cae95
Unify object representation.
2018-02-24 20:16:41 +01:00
2b5d265954
Don't deliver to local followers.
2018-02-24 19:04:56 +01:00
df73a9c6d6
.
2018-02-24 18:50:02 +01:00
5bc7628022
Fix.
2018-02-24 18:49:09 +01:00
59ad395ffa
Better signature errors messages.
2018-02-24 18:47:08 +01:00
a7c3ead9e6
Invalidate user after key creation.
2018-02-24 18:23:47 +01:00
fb5add56fa
Bit more signature debugging.
2018-02-24 18:01:49 +01:00
ac67453e8a
More logging for signature problems.
2018-02-24 17:36:26 +01:00
e5fcc51a06
Remove unneccesary subscriptions on update.
2018-02-24 17:36:02 +01:00
fa3aa59248
Add missing alias.
2018-02-24 13:11:39 +01:00
fb02300234
Pleroma AP detection mechanism.
2018-02-24 13:06:53 +01:00
9a4d400ff4
Fix remote following.
2018-02-24 12:49:56 +01:00
06b512acf1
Never update local users from foreign sources.
2018-02-24 12:05:40 +01:00
6744710908
Fixes 4: In Da Hood.
2018-02-24 10:58:16 +01:00
42f30d67fa
Fixes Christmas Special
2018-02-24 10:52:12 +01:00
541a4cbbb6
Oh no! More fixes!
2018-02-24 10:51:15 +01:00
01d5ef65fa
More fixes to user upgrading.
2018-02-24 10:42:47 +01:00
efd4d04933
Fix user upgrading code.
2018-02-24 10:28:38 +01:00
3ecdab0911
Merge branch 'develop' into 'develop'
...
Make user bio optional
See merge request pleroma/pleroma!68
2018-02-24 08:37:13 +00:00
1331a39d39
Webfinger: Remove leading @s.
2018-02-23 16:55:12 +01:00
aa79d64e0d
Correctly stitch mastodon -> ostatus replies.
2018-02-23 15:00:41 +01:00
2583a9f6e8
More logging.
2018-02-23 15:00:19 +01:00
95e6e82138
Correctly display accounts without name.
2018-02-22 19:22:10 +01:00
2757682894
More logging.
2018-02-22 14:57:35 +01:00
5dc68d303b
Get objects that people you know favorite.
2018-02-22 09:02:34 +01:00
c443aec83d
Add banner image to user json.
2018-02-22 08:24:18 +01:00
37e406ae36
Get avatar and banner from AP users.
2018-02-22 08:14:15 +01:00
1555b7fab5
Add AP fixup task.
2018-02-21 22:59:00 +01:00
8895088029
Fix for following type change.
2018-02-21 22:27:16 +01:00
4816b09fa7
Add user upgrade function.
2018-02-21 22:21:40 +01:00
f48bc5c3e1
Make User.following a postgres array.
2018-02-21 22:20:29 +01:00
ec07e087bc
Make user bio optional
2018-02-21 23:31:57 +03:00
94db9ac4db
Merge branch 'develop' into feature/activitypub
2018-02-21 18:34:19 +01:00
56cfe71858
Add moderator task.
2018-02-21 18:33:36 +01:00
765671a5b0
Add password reset task.
2018-02-21 18:24:17 +01:00
a06b9a3e0b
Logging.
2018-02-21 16:22:20 +01:00
67afd024a7
Streamer: Make it less chatty.
2018-02-21 15:44:00 +01:00
810cf8618f
ActivityPub: Fetch missing activities on reply.
2018-02-21 15:22:24 +01:00
947ba6495d
More TwAPI fixes.
2018-02-21 10:31:13 +01:00
92021fd00c
Logging, put incoming ap docs into incoming queue.
2018-02-21 08:57:14 +01:00
279e1ce556
Typo.
2018-02-21 08:54:48 +01:00
66aa35903e
Add missing alias.
2018-02-21 08:51:50 +01:00
b52672294e
Move incoming AP to Federator.
2018-02-21 08:51:03 +01:00
391b3e3586
TwitterAPI: Fix some bugz.
2018-02-21 08:16:04 +01:00
fd95075e32
TwitterAPI: Fix mentions.
2018-02-20 19:50:34 +01:00
eec6a87dbb
Allow moderators to delete posts.
2018-02-20 18:54:13 +01:00
5bc810c452
Add moderator function.
2018-02-20 18:44:50 +01:00
486e205810
Remove some noise.
2018-02-20 08:52:31 +01:00
9c89916969
ActivityPub: One queue item per server.
2018-02-20 08:51:19 +01:00
297a2c7d3f
Ignore duplicate create activities.
2018-02-19 17:37:45 +01:00
ffa2f57c36
Salmons can't carry private information.
2018-02-19 11:14:46 +01:00
6b6ab592ab
AP: Fix incoming conversations.
2018-02-19 10:39:03 +01:00
6b32b9e346
Notifications: Use all recipients, not just "to".
2018-02-19 10:05:26 +01:00
01faa7c555
TwitterAPI: support follow activities without published date.
2018-02-19 09:50:57 +01:00
1633470e4a
TwitterAPI: Only fetch creates, announces, follows.
2018-02-19 09:50:41 +01:00
313f186a66
Ostatus: Use all recipients as mentions.
2018-02-19 08:34:55 +01:00
932d346d35
fix typo.
2018-02-18 23:13:19 +01:00
8b11546334
For existing users, just replace info.
2018-02-18 23:11:31 +01:00
decbf3a47f
fix typo.
2018-02-18 23:02:44 +01:00
342d0b01d1
Only push to followers if they are addressed.
2018-02-18 23:01:37 +01:00
78516a8daa
Salmon: Take both versions of public keys.
2018-02-18 22:57:07 +01:00
dc1d3ceb72
Fix log.
2018-02-18 22:41:38 +01:00
e368b68dcf
Log but ignore signature errors.
2018-02-18 22:40:08 +01:00
76e71f47d3
Inbox: Don't add the same thing twice.
2018-02-18 22:37:44 +01:00
010f818a29
Fix conversations.
2018-02-18 20:52:07 +01:00
deaad6d97a
Fix delivery to CC.
2018-02-18 16:59:41 +01:00
8567feed47
Salmon is ok!
2018-02-18 16:15:04 +01:00
803bdc1a67
Federate non-public over ActivityPub only, do some better signing.
2018-02-18 16:05:25 +01:00
4bc57ef20c
Don't relay non-public messages.
2018-02-18 15:58:18 +01:00
5d89997a70
Respect visibility in API.
2018-02-18 15:50:34 +01:00
5729233c36
Don't show unlisted in public.
2018-02-18 15:32:11 +01:00
c974f6544f
Show users their own posts in timeline.
2018-02-18 15:20:36 +01:00
44586f2967
ActivityPub: Fallback for unhandled outgoing activities.
2018-02-18 15:20:03 +01:00
2997fe1ba9
CommonAPI: If no visibility is given, return parent visibility.
2018-02-18 15:04:26 +01:00
d4b08dd838
MastodonAPI: Post with visibility settings
2018-02-18 14:56:36 +01:00
539340d914
Handle sensitive property.
2018-02-18 14:14:16 +01:00
20e6190ead
Transmogrify outgoing nsfw.
2018-02-18 14:07:13 +01:00
8ca66b5961
ActivityPub: Add conversation id.
2018-02-18 13:58:52 +01:00
912ca56e59
Mastodon StatusView: Return correct visibility.
2018-02-18 13:51:51 +01:00
6ab0aba50a
Transmogrify outgoing hashtags.
2018-02-18 13:51:03 +01:00
6046f10431
Actually fix incoming attachments.
2018-02-18 13:06:51 +01:00
6352dffd13
Drop unhandle activities.
2018-02-18 12:51:35 +01:00
b99eeb2bdf
Try to fetch AP user data first.
2018-02-18 12:27:05 +01:00
68752b2047
Switch protocols to AP when post come in through AP.
2018-02-18 12:04:59 +01:00
77c6c424a6
ActivityPub: Make fake Create activities for objects without one.
2018-02-18 11:24:54 +01:00
81ea359a7c
ActivityPub: Handle incoming announces.
2018-02-17 21:57:31 +01:00
5e36b750c1
ActivityPub: Fetch an object from an id.
2018-02-17 21:56:33 +01:00
0f2ad25a7b
AcitvityPub: Outgoing Announces.
2018-02-17 20:47:45 +01:00
32b995fbb6
ActivityPub: Implement outgoing likes.
2018-02-17 20:22:14 +01:00
e1b12a7782
ActivityPub: Handle incoming likes.
2018-02-17 20:13:12 +01:00
1f98de2079
ActivityPub: Use shared inbox.
2018-02-17 18:39:12 +01:00
ab27c90c9f
ActivityPub: Handle attachments.
2018-02-17 18:38:58 +01:00
fb7b926be3
Handle black name fields on incoming users.
2018-02-17 18:15:48 +01:00
c2d0cb1a29
ActivtyPub Delivery: Use shared inbox if possible.
2018-02-17 16:18:10 +01:00
7b26443a76
ActivityPub: Send out Accept after Follow.
2018-02-17 16:08:55 +01:00
e7b73359e3
ActivityPub: Partly handle incoming follows.
2018-02-17 14:55:44 +01:00
5682e48a25
ActivityPub: tags -> tag.
2018-02-17 14:20:53 +01:00
05ba6ca1b8
Do some transmogrifying for the output.
2018-02-17 14:11:20 +01:00
5a371892a0
Fix specs.
2018-02-17 10:26:44 +01:00
7851b9ba81
ActivityPub: Use recipients fields.
2018-02-15 20:32:07 +01:00
5454ec6a6c
ActivityPubController: Handle inbox data.
2018-02-15 20:00:43 +01:00
ef0300889d
Transmogrifier: Handle basic notice creation.
2018-02-15 20:00:06 +01:00
ae26604378
ActivityPub: Refactor create function.
2018-02-15 19:59:35 +01:00
38b61fddfe
HttpSignature Plug: Skip if already valid.
2018-02-15 19:58:26 +01:00
b331cb449a
Merge branch 'develop' into feature/activitypub
2018-02-12 10:24:15 +01:00
26ccb768d3
Make test output easier to read.
2018-02-12 10:14:11 +01:00
91928b06ab
Merge branch 'hakabahitoyo/pleroma-feature/atom-feed-pagination' into develop
2018-02-12 08:15:37 +01:00
8cf97ee8e1
ActivityPub: Basic note federation with Mastodon.
2018-02-11 20:43:33 +01:00
ce31f3a922
Twitter Representers: Handle Mastodon attachments.
2018-02-11 17:21:06 +01:00
ae1ec858f4
Basic AP user building.
2018-02-11 17:20:43 +01:00
52200998c9
Merge branch 'develop' into feature/activitypub
2018-02-11 09:50:55 +01:00
a61f21ff4f
print <link rel="next"> element in atom.feed
2018-02-09 23:10:32 +09:00
7124f12a94
introduce max_id parameter in feed.atom (debug)
2018-02-09 21:46:05 +09:00
08f458e6df
UtilController: Fix statusnet config api compatibility.
2018-02-09 13:43:12 +01:00
9c61f60558
introduce max_id parameter in feed.atom
2018-02-09 21:41:30 +09:00
af854f7e01
Merge branch 'develop' into 'develop'
...
action_fallback for OAuth Controller
See merge request pleroma/pleroma!63
2018-02-09 08:57:54 +00:00
f0cde24f71
Merge branch 'fix/config-disable-chat' into 'develop'
...
Add config option for enabling/disabling chat.
See merge request pleroma/pleroma!58
2018-02-08 18:18:28 +00:00
73249fa5ff
Changed fallback controller to handle all cases from OAuthController
2018-02-08 18:15:59 +00:00
314f4775c5
Merge branch 'develop' of https://git.pleroma.social/calv/pleroma into develop
2018-02-08 16:58:31 +00:00
bdb5dd2194
Create action_fallback for username/password incorrect input
2018-02-08 16:57:30 +00:00
2f291576e4
Fix compile errors on 1.4.5
2018-02-08 16:03:30 +01:00
286f6698ee
Detect file type if none given.
2018-02-04 15:22:30 +02:00
61c16193de
Merge branch 'move-backend-images' into 'develop'
...
Move avi.png & banner.png from /priv/static/static to /priv/static/images
See merge request pleroma/pleroma!60
2018-02-03 13:05:20 +00:00
c8a2931549
add backend endpoint /images
2018-02-03 20:52:01 +09:00
ea6d1b2b17
move avi.png & banner.png from /priv/static/static to /priv/static/images
2018-02-03 20:43:14 +09:00
f0745148a3
Add config option for enabling/disabling chat.
2018-02-03 13:42:37 +02:00
29be70c008
Add remote following of local profiles.
2018-02-02 00:14:05 +02:00
ab83e0de6d
TwitterAPI: Add is_local to user view.
2018-02-01 21:41:19 +02:00
0f194dc56b
Merge branch 'feature/instance-thumbnail-api' into 'develop'
...
Provide instance thumbnail in /api/v1/instance
See merge request pleroma/pleroma!55
2018-01-31 18:34:52 +00:00
ab8b9ababa
Split emoji to default and custom.
2018-01-31 16:29:22 +02:00
03c15a54f5
provide instance thumbnail at /api/v1/instance (debug)
2018-01-31 23:09:47 +09:00
e47f60c053
provide instance thumbnail at /api/v1/instance (debug)
2018-01-31 23:04:34 +09:00
a4335e391f
provide instance thumbnail at /api/v1/instance
2018-01-31 22:51:25 +09:00
5e37adedfb
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop
2018-01-30 12:21:05 +01:00
ad0ab3a57b
Merge branch 'hakabahitoyo/pleroma-feature/atom-feed-logo' into develop
2018-01-30 12:20:39 +01:00
cefb6cfea1
provide logo at feed.atom (debug)
2018-01-30 19:37:04 +09:00
b713b28dfd
provide logo at feed.atom
2018-01-30 19:26:07 +09:00
2f23ae5b68
Merge branch 'pr-upstream-http-proxy' into 'develop'
...
Pr upstream http proxy
See merge request pleroma/pleroma!43
2018-01-30 08:16:31 +00:00
64e51c2cfa
Fix incoming Pleroma CWs. Closes #96 .
2018-01-29 17:44:35 +01:00
066fe1a697
use nil instead of empty string
2018-01-29 10:06:16 -05:00
dffde6631d
Merge remote-tracking branch 'upstream/develop' into pr-upstream-http-proxy
2018-01-24 13:15:54 -05:00
0f722a8c22
Stats: Make less crashy and improve query.
2018-01-20 18:38:30 +01:00
beb13bf3a9
Revert "Revert "Add remote follow pages.""
...
This reverts commit b259b4e4d1
2018-01-18 18:42:44 +02:00
57d413e655
Revert "Revert "Add remote follow path to webfinger.""
...
This reverts commit fb5aa34092
2018-01-18 18:42:32 +02:00
b259b4e4d1
Revert "Add remote follow pages."
...
This reverts commit 47e8c8db05
2018-01-18 03:42:18 +02:00
fb5aa34092
Revert "Add remote follow path to webfinger."
...
This reverts commit bc689740f0
2018-01-18 03:42:09 +02:00
47e8c8db05
Add remote follow pages.
2018-01-18 03:11:03 +02:00
bc689740f0
Add remote follow path to webfinger.
2018-01-18 02:38:02 +02:00
b3e7d7ae6d
Fetch external profile in the background.
2018-01-16 15:31:03 +02:00
80f6ac412a
Merge branch 'default-pictures' into 'develop'
...
Add a default profile picture and banner.
See merge request pleroma/pleroma!48
2018-01-15 20:26:49 +00:00
14b086eec2
Add a default profile picture and banner.
...
This removes the placehold.it dependency.
2018-01-15 22:18:17 +02:00
d8db39564e
Move user count to stats agent.
2018-01-14 08:15:11 +02:00
9717166d10
Add a stats agent for storing data from expensive queries.
2018-01-13 18:24:16 +02:00
d56ab43609
Ask for proxy URL if proxy enabled.
...
Also change the true/false question to y/n
2018-01-12 22:38:14 +02:00
29b7e822fb
added question about activating mediaproxy to config generator
2018-01-09 12:31:11 +01:00
1e185b9301
apply proxy settings to media_proxy
2017-12-31 09:25:00 -05:00
5ddd15d794
make httppoison use configurable http proxy
2017-12-30 13:08:36 -05:00
5c09d8d3f1
Unlink follow import process from the one processing request.
...
Mistakes were made.
2017-12-23 16:40:43 +02:00
0ccd0e5cc9
Remove a useless URI.encode call in MediaProxy
2017-12-21 20:59:10 +01:00
35ac549a99
Merge branch 'media-proxy' into 'develop'
...
Media proxy
See merge request pleroma/pleroma!34
2017-12-20 14:22:24 +00:00
2a744cdff8
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop
2017-12-19 16:15:45 +01:00
f1f79c0dca
Fix timelines in subway tooter.
2017-12-19 16:15:07 +01:00
29c9812789
Merge branch 'fix/twitterapi-follow-lists' into 'develop'
...
Fix follower/following lists.
Closes #29
See merge request pleroma/pleroma!41
2017-12-18 22:44:15 +00:00
47887ac848
MastoAPI: Fix always-sensitive bugs.
2017-12-18 16:56:03 +01:00
846d59a536
Send out salmons before websub.
2017-12-18 16:16:22 +01:00
1969773fb4
Fix follower/following lists.
...
Add tests.
2017-12-18 16:37:26 +02:00
6b48489237
Merge branch 'feature/follow-import' into 'develop'
...
Add follow import.
See merge request pleroma/pleroma!40
2017-12-18 10:59:57 +00:00
fdfb508259
Run follow import in the background.
2017-12-12 21:04:41 +02:00
d89193a8d7
Allow uploading a file for follow import.
2017-12-12 21:03:28 +02:00
4a13b84887
Add recipients field to activities.
...
Also do some very basic checks for AP message insertion.
2017-12-12 18:07:14 +01:00
39ccfdc084
Add follow import.
2017-12-12 18:35:23 +02:00
f909aec050
proxy emojis
...
(i fix emojos better than gargon but sshhhhh)
2017-12-12 12:30:24 +01:00
8e82547179
fix content-type and fallback to image/jpeg
2017-12-12 11:45:55 +01:00
888ec9e579
ActivityPub: Check inbox requests for valid signature.
2017-12-12 10:17:50 +01:00
a9c23e1c32
Add plug to validate signed http requests.
2017-12-12 10:17:21 +01:00
64330d9455
ActivityPub: Add object routes / controller.
2017-12-11 18:21:33 +01:00
a89a613e4e
ActivityPub: Use only string keys in views.
2017-12-11 18:20:41 +01:00
da005d3332
ActivityPub: Add Objects View.
2017-12-11 18:19:46 +01:00
4b06e46a3a
Merge branch 'fix/tootdon-mentions' into 'develop'
...
Fix Tootdon linking the whole status when mentioning someone.
See merge request pleroma/pleroma!39
2017-12-11 16:21:43 +00:00
b00e230760
Add a bunch of useless HTML to mentions.
2017-12-11 18:14:33 +02:00
c3bcafc51b
HTTPSig: Add method to validate conn
2017-12-11 10:37:40 +01:00
5599c5920c
Basic incoming AP support.
2017-12-11 10:37:22 +01:00
9093b2cf49
Merge remote-tracking branch 'upstream/develop' into media-proxy
2017-12-11 02:45:28 +01:00
077faaed8c
Limit body size to 25MB
2017-12-11 02:31:37 +01:00
25118aeef7
Add link to AP address in webfinger.
2017-12-09 15:34:43 +01:00
30e9b22f96
Merge branch 'develop' into feature/activitypub
2017-12-09 11:00:56 +01:00
d5a13c10ac
Merge branch 'feature/user_deletion' into develop
2017-12-09 10:10:45 +01:00
ef2322bdb7
Delete notifications on activity deletion.
2017-12-08 18:17:30 +01:00
bad499b3fd
Basic user deletion.
2017-12-08 17:50:11 +01:00
35cfbf43a0
Merge branch 'fix/linkify' into 'develop'
...
Fix links with HTML elements and/or parentheses.
See merge request pleroma/pleroma!38
2017-12-08 12:34:03 +00:00
40c30ab895
Merge branch 'fix/mastoapi-attachment-linking' into 'develop'
...
MastoAPI: don't add attachment links.
Closes #92
See merge request pleroma/pleroma!37
2017-12-08 12:32:33 +00:00
d7da3ca05d
Merge branch 'postgresetup' into 'develop'
...
first version of safe DB setup
See merge request pleroma/pleroma!32
2017-12-08 12:31:14 +00:00
a3e68f0233
Allow parentheses in links.
2017-12-07 21:38:31 +02:00
bf91e5659f
Fix HTML escape breaking some links.
2017-12-07 21:36:06 +02:00
5436dbaeaf
MastoAPI: don't add attachment links.
2017-12-07 20:44:09 +02:00
6df6ad0b42
User deletion: Remove relationships.
2017-12-07 18:13:05 +01:00
a78ae2a685
Don't follow deactivated users.
2017-12-07 17:51:55 +01:00
b727ecc5e7
Add function to deactivate users.
2017-12-07 17:47:23 +01:00
0ec5aeb8a7
Don't log in deactivated users.
2017-12-07 17:41:34 +01:00
e31a5ff4af
Priority queue fixes.
2017-12-06 16:51:11 +01:00
66c3813ea6
Add basic queue prioritization.
2017-12-05 18:21:30 +01:00
72f7baa654
Merge remote-tracking branch 'upstream/develop' into media-proxy
2017-12-05 14:12:15 +01:00
1c90bfb4f6
Merge remote-tracking branch 'origin/develop' into feature/chat
2017-12-05 10:20:00 +01:00
5945ec84e9
Don't save user in socket, just save the name.
2017-12-05 10:01:36 +01:00
69f1024bb0
Add basic channel state.
2017-12-05 09:36:26 +01:00
c1fa1e8844
Fix basic auth for passwords with a colon.
2017-12-04 22:45:16 +02:00
5c40986120
Basic backend chat.
2017-12-04 19:10:15 +01:00
964e2dd2f0
unfuck
2017-12-04 04:06:52 +03:00
6b60f5f64a
made psql script compatible with migrations or generate_config reruns
2017-12-04 03:56:54 +03:00
071f518028
reverts config gen
2017-12-04 03:56:54 +03:00
a884e08271
fix
2017-12-04 03:56:54 +03:00
4071403117
fixes
2017-12-04 03:56:54 +03:00
0673511d39
first version of safe DB setup
2017-12-04 03:56:54 +03:00
d08a34e88b
OStatus: Add user bio as summary field
...
Fixes problem with bio federation.
2017-12-03 13:34:17 +01:00
5637d163e6
MastodonAPI: Add proper user count.
2017-11-30 14:59:44 +01:00
1cb5cbdc6c
Improve error handling, add configuration
2017-11-28 21:44:25 +01:00
e28c110eba
mandatory typo fix...
2017-11-28 20:50:42 +01:00
5f35fdcf5d
media proxy: good enough wip
2017-11-28 20:50:34 +01:00
9d1c0ec18d
Merge branch 'salmon-native-keys' into 'develop'
...
Salmon: generate private key with native crypto if available.
See merge request pleroma/pleroma!33
2017-11-28 16:46:01 +00:00
4524721fba
Salmon: generate private key with native crypto if available.
2017-11-28 16:50:12 +01:00
c680ae581d
Return xml notice at /notice path.
2017-11-27 17:24:52 +01:00
44dc694882
Add configuration generation tool, update readme.
2017-11-23 16:22:20 +01:00
d16b613929
MastodonUI login: Show error message on error.
2017-11-23 12:06:14 +01:00
698a75cb39
Merge branch 'develop' into 'develop'
...
Pleroma-Dark default theme for the Mastodon Frontend
See merge request pleroma/pleroma!27
2017-11-22 14:19:27 +00:00
1625021a9c
Merge branch 'fix/self-follow' into 'develop'
...
Dont include the user in their own follower count.
See merge request pleroma/pleroma!29
2017-11-21 23:09:59 +00:00
e9037ffc8d
Do not include user in their own follower count.
2017-11-21 15:33:09 +02:00
fa19de97ba
MastoAPI: no more than 4 attachments.
2017-11-20 22:49:20 +02:00
747a68a075
Treat internal emoji like external.
2017-11-20 17:53:21 +01:00
cf0bbf320d
MastoAPI: Add max_toot_chars.
2017-11-20 08:54:47 +01:00
bd921ca5d7
Fix posts being streamed to non-local websocket channels.
2017-11-20 07:58:43 +02:00
4db5954786
Don't let the user unfollow their own account.
2017-11-20 07:50:56 +02:00
aadf54e0df
Don't show the user in their own following count.
2017-11-20 00:31:39 +02:00
36011fee4e
Add Custom Pleroma-dark theme
2017-11-19 19:07:19 +00:00
52aa65fe6e
Federator Queue: Add seperate in/out queues.
2017-11-19 15:10:51 +01:00
5ff5d583b6
MastodonAPI: Streaming fixes.
...
Now shows repeats in the home tl.
2017-11-19 13:47:50 +01:00
0f099dac67
MastodonAPI: Add sign out.
...
Close #79
2017-11-19 13:23:16 +01:00
c336a13d2c
MastoAPI: Only return create activties in contexts.
2017-11-19 12:59:23 +01:00
59770c3f5c
Fix all compilation warnings
2017-11-19 02:22:07 +01:00
ed3403ad8b
Merge branch 'formatting-fixes' into 'develop'
...
Formatting fixes
Closes #80
See merge request pleroma/pleroma!22
2017-11-18 15:58:44 +00:00
146ec80285
Merge branch 'fix/mastofe-login-redirect' into 'develop'
...
Redirect to Getting Started on login.
See merge request pleroma/pleroma!21
2017-11-18 14:38:05 +00:00
f53cdabcdf
Add #nsfw tag if sensitive content bit is set
2017-11-18 16:30:18 +02:00
31e4277ba5
Don't add summary if empty.
2017-11-18 15:25:22 +02:00
fb118b2978
Don't insert newlines to generated HTML.
...
MastoFE doesn't like them.
2017-11-18 14:46:54 +02:00
66e78c3ec4
Escape HTML instead of discarding it.
2017-11-18 14:43:41 +02:00
4647bcd6e6
Don't start streamer during tests.
2017-11-18 12:22:07 +01:00
9c60cc88df
Redirect to Getting Started on login.
2017-11-16 20:47:44 +02:00
a743940463
MastoAPI: Implement all streaming functions.
2017-11-16 16:49:51 +01:00
5719f69ae3
MastodonAPI: Stream fixes.
2017-11-16 13:48:58 +01:00
43499848d0
Small css fix.
2017-11-16 12:58:33 +01:00
189513e4ff
Add styles to make login page resemble mastodon's
2017-11-16 13:26:56 +02:00
8de890a0d9
Add custom emoji to Mastodon UI initial state.
2017-11-16 09:40:06 +01:00
ced0d64d75
MastoAPI: Make attachment ids strings.
2017-11-15 18:58:39 +01:00
1cca544e20
Merge branch 'twitterapi-bitlbee' into 'develop'
...
TwitterAPI: Add missing endpoints for bitlbee.
Closes #67
See merge request pleroma/pleroma!18
2017-11-14 16:47:54 +00:00
f9828e578c
TwitterAPI: Add /users/show.
2017-11-14 17:34:48 +02:00
163c658202
TwitterAPI: Add unimplemented /mutes/users/ids.
2017-11-14 16:12:52 +02:00
22bbe27115
TwitterAPI: Add unimplemented /friendships/no_retweets/ids.
2017-11-14 16:10:13 +02:00
3533bf7eac
TwitterAPI: Add /friends/ids.
2017-11-14 16:04:58 +02:00
06c3ee3bac
Accept 1 as true.
2017-11-14 15:54:50 +02:00
c84723b679
MastoAPI: Add media timelines.
2017-11-14 15:41:16 +02:00
083cd169d2
MastoAPI: Fix repeat api bug.
...
Documentation was wrong, reblogging actually returns the reblog, not
the reblogged status.
2017-11-13 09:48:56 +01:00
5fc6e9d467
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop
2017-11-12 14:25:15 +01:00
d293ceb1b5
Add Mastodon frontend.
2017-11-12 14:23:05 +01:00
08bc316742
Merge branch 'mastodon-notification-endpoints' into 'develop'
...
MastoAPI: Add notification endpoints get, clear and dismiss.
Closes #42
See merge request pleroma/pleroma!13
2017-11-12 11:08:06 +00:00
87dee3902a
Merge branch 'filetype-recognition' into 'develop'
...
Use headers for file content type recognition.
See merge request pleroma/pleroma!14
2017-11-12 09:27:59 +00:00
efcf54dc02
Merge branch 'mastoapi-update-credentials' into 'develop'
...
MastoAPI: Add update credentials endpoint.
Closes #61
See merge request pleroma/pleroma!15
2017-11-12 09:24:32 +00:00
18a95cd375
Add common video and audio types.
2017-11-12 01:20:50 +02:00
fc7483cb3c
MastoAPI: Add update credentials endpoint.
2017-11-12 00:27:09 +02:00
260b148b92
Use headers for file content type recognition.
2017-11-11 23:24:54 +02:00
414c52509b
MastoAPI: Websocket streaming for federated timeline.
2017-11-11 20:00:11 +01:00
bd5bdc4c24
MastoAPI: Basic streaming.
2017-11-11 14:59:25 +01:00
a1923d20e8
MastoAPI: Fix reblog emojis.
2017-11-11 11:18:05 +01:00
fd12e585c9
Handle existing redirect params.
2017-11-10 18:24:50 +01:00
1d3d66a841
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop
2017-11-10 17:37:54 +01:00
6e9c22c0af
MastoAPI: Use string ids everywhere.
2017-11-10 17:18:19 +01:00
e6a78c6ed0
MastoAPI: Add notification get, clear and dismiss.
2017-11-10 15:24:52 +02:00
1b8ad9f731
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop
2017-11-09 16:49:32 +01:00
266d9c008d
MastoAPI: Fetch statuses in search.
2017-11-09 16:48:45 +01:00
2247d7580e
Merge branch 'fix-tootdon-image-uploads' into 'develop'
...
Correct mimetype on bad uploads.
See merge request pleroma/pleroma!12
2017-11-09 14:41:44 +00:00
e942e1e552
Correct mimetype on bad uploads.
2017-11-09 15:01:59 +02:00
f1d27a5fbb
Add actor column to activities.
2017-11-09 10:41:19 +01:00
41b8a76e96
Re-fetch user data on salmon decode error.
2017-11-09 08:32:54 +01:00
77e272df2d
Merge branch 'following-you-in-user-view' into 'develop'
...
TwitterAPI user view: add follows_you.
See merge request pleroma/pleroma!11
2017-11-08 17:57:13 +00:00
f7fc048aeb
TwitterAPI user view: add follows_you.
2017-11-08 19:13:03 +02:00
d2430d5007
Look through whole db for user timelines.
...
They already have an index that's good enough.
2017-11-08 17:25:18 +01:00
4656cb9b99
TwitterAPI user view: add blocks.
2017-11-08 13:02:00 +02:00
6c0758e041
TwitterAPI: Add blocks.
2017-11-08 00:04:53 +02:00
be67db5547
Merge branch 'mastodon-emoji-endpoint' into 'develop'
...
Add mastodon API endpoint for custom emoji.
See merge request pleroma/pleroma!8
2017-11-07 20:01:15 +00:00
c6210183e1
Add mastodon API endpoint for custom emoji.
2017-11-07 21:55:01 +02:00
d761b1543a
Merge branch 'authenticated-profile-fetching' into 'develop'
...
Allow profile fetching for authenticated users only.
Closes #54
See merge request pleroma/pleroma!7
2017-11-07 18:58:22 +00:00
722c4614ad
Allow self-rt.
2017-11-07 16:45:27 +01:00
7da978f3f5
Linkify fixes.
2017-11-07 12:06:37 +01:00
6dfa62800a
Revert "Longer timeouts for user fetching."
...
Breaks too many tests.
This reverts commit 7de3a65214
2017-11-07 09:41:35 +01:00
7de3a65214
Longer timeouts for user fetching.
2017-11-07 09:11:19 +01:00
f85566324e
Allow profile fetching for authenticated users only.
2017-11-07 00:33:44 +02:00
ed1eb5deea
Merge branch 'fix-tootdon-oauth' into 'develop'
...
Fix tootdon logins.
See merge request pleroma/pleroma!6
2017-11-06 20:27:31 +00:00
b0e27b21dd
Fix tootdon logins.
2017-11-06 21:51:31 +02:00
7252f6b054
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop
2017-11-05 12:12:19 +01:00
046bee34d3
Fix bug when no posts are in the db.
2017-11-05 12:11:59 +01:00
fa1f11e8e9
Merge branch 'feature/blocks' into 'develop'
...
Feature/blocks
See merge request pleroma/pleroma!5
2017-11-03 08:56:44 +00:00
c6b9b777da
MastoAPI: Add list of blocked users.
2017-11-03 08:51:17 +01:00
5bf92e50be
MastoAPI: Add blocking.
2017-11-03 08:38:05 +01:00
33beb51da4
MastoAPI: Add blocking to AccountView.
2017-11-03 08:23:31 +01:00
8a1a7191fd
MastoAPI: Fix mentions always being for an anonymous user.
2017-11-03 08:13:39 +01:00
9b63647aff
MastoApi: Add blocking to fetches.
2017-11-02 22:53:34 +01:00
d89a7a0b34
TwitterAPI: Add blocking to fetches.
2017-11-02 22:50:42 +01:00
867ac1e4f5
Handle nil cases.
2017-11-02 22:47:48 +01:00
8ef58a266b
Don't return blocked users' activities in contexts.
2017-11-02 22:44:36 +01:00
a47727adde
Don't return activities from blocked users.
2017-11-02 22:37:26 +01:00
632da6c927
Don't create notifications if the user is blocked.
2017-11-02 22:08:22 +01:00
6a5f087174
Add blocks to User.
2017-11-02 21:57:37 +01:00
9be286a900
Handle empty terms / tags.
2017-11-01 09:33:29 +01:00
6f05367325
Federate out content warnings.
2017-10-31 19:51:58 +01:00
e014cc6ed8
Allow using cws in mastodon api.
2017-10-31 19:44:36 +01:00
44295dd49a
MastoAPI: Include CW.
2017-10-31 17:49:47 +01:00
04217f52c9
TwitterAPI: Display cws.
2017-10-31 17:43:37 +01:00
4cbf17dac6
Save cws in the activitypub data.
2017-10-31 17:30:46 +01:00
4dcbb64f19
Avoid potentially slow count queries for user note count.
...
For a variety of reasons, posgresql won't use the available actor,
type index to do an index only scan. We now just increase the user
note count, which will lead to slightly wrong counts in some cases,
but it's better than the potentially very slow count query.
2017-10-31 16:37:11 +01:00
3037814fde
Only search through last 100_000 activities for fetches.
...
This is purely a performance enhancement
2017-10-31 15:26:37 +01:00
968a546d4a
MastoAPI: Return id as string instead of integer.
2017-10-31 14:51:41 +01:00
ce7f9f527c
MastoAPI: Always return an url for statuses.
...
External url if available, id if not.
2017-10-31 14:40:12 +01:00
502cb38cd6
Move user search to User module.
2017-10-30 19:23:16 +01:00
efe12e1a73
Fix /api/v1/accounts/search by splitting account search into its own function
2017-10-30 03:37:07 +00:00
2ffc6da207
Clean style.
...
Use 'follow' instead of 'follows' and correct indentation.
2017-10-29 00:30:10 +03:00
c56d28f96c
Fix return type of /api/v1/follows
2017-10-29 00:07:38 +03:00
11d2287476
Return error message on errors
2017-10-28 17:09:32 +03:00
813d2eaaf0
Add mastodon API endpoint for follow
2017-10-28 17:09:32 +03:00
5293516730
Use more efficient query to fetch likes.
2017-10-24 14:39:01 +02:00
9af560083f
Use more efficient user note count update query.
2017-10-24 14:16:17 +02:00
ec546baee9
Use different index for object fetching.
2017-10-24 10:39:23 +02:00
261ec82451
Return nil for nil object requests.
2017-10-24 08:39:24 +02:00
b35ff8f755
Use index in basic activity query.
2017-10-23 18:36:53 +02:00
9f417fd5e9
Speed up deletion and related queries.
2017-10-23 18:30:09 +02:00
5912dd0f5d
Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into develop
2017-10-23 16:28:32 +02:00
64bc38e009
MastoAPI: Add emoji output.
2017-10-23 16:27:51 +02:00
fe7804e42d
Add an API endpoint for emoji.
2017-10-19 22:51:56 +03:00
38f3908c14
Revert "Simplify query."
...
This reverts commit a17b261379
2017-10-19 17:56:27 +02:00
6af164f27b
Add password reset.
2017-10-19 17:37:24 +02:00
a17b261379
Simplify query.
2017-10-18 11:56:47 +02:00
b4f055b604
Don't reject already accepted subscriptions.
2017-10-05 12:53:16 +02:00
6268b7e0eb
HTTP Signatures: Work with all test vectors.
2017-09-18 18:10:21 +02:00
9cefbaf016
Start of HTTP Signatures.
2017-09-18 11:39:57 +02:00
2b980dea2f
Remove tag links for now, they break some regular links.
2017-09-17 23:03:03 +02:00
270c903220
Add tag links.
2017-09-17 15:21:44 +02:00
d009a79df5
TwitterAPI: Return proper error.
...
Fixes #32 .
2017-09-17 14:37:00 +02:00
ae38b72e24
MastoAPI: Fix reblog view.
2017-09-17 14:25:34 +02:00
260f09dd6c
MastoAPI: Return reblogs, too.
2017-09-17 14:20:54 +02:00
6000f61727
MastoAPI: Add repeats to statusview.
2017-09-17 13:54:14 +02:00
fb46d6fbc4
Prefer post-specific emoji.
2017-09-17 13:24:52 +02:00
422d0f324f
MastodonAPI: Add user favorites endpoint.
2017-09-17 13:09:49 +02:00
6d5bd4dcc0
TwitterAPI: Use correct endpoint for tag timeline.
2017-09-17 13:03:46 +02:00
6877d7aaad
Fix typo.
2017-09-17 12:08:50 +02:00
255a681782
TwitterAPI: Add tag timeline.
2017-09-17 11:45:16 +02:00
b7b3e3f263
Use inserted_at as sort in search.
2017-09-17 11:32:24 +02:00
678dd4c8ec
Use desc id to sort instead of desc inserted_at
...
Should mean the same and is indexed.
2017-09-17 11:16:08 +02:00
7c82b82197
Make emoji configurable in files.
2017-09-16 16:49:46 +02:00
959e993c7d
Apply incoming custom emoji.
2017-09-16 16:40:20 +02:00
16b1fcd271
Handle incoming emoji.
2017-09-16 16:27:48 +02:00
884006a9e9
Federate emoji out.
2017-09-16 16:14:23 +02:00
79aeb219d8
Small emoji refactor.
2017-09-16 15:47:45 +02:00
c17c8ce36d
Don't check limit twice in TwitterAPIController.
2017-09-16 15:47:07 +02:00
03952a2760
Sort by updated_at
...
the updated_at column isn't indexed, so postgres won't take the wrong index.
2017-09-16 14:51:55 +02:00
f039c9c19a
Don't specify order in results for now.
2017-09-16 14:40:53 +02:00
5d1f8dcd1c
TwitterAPI: Add search.
2017-09-16 14:33:47 +02:00
44693c100d
Federate banners out.
2017-09-16 13:44:08 +02:00
0fbf1911f5
Banners are objects.
2017-09-16 13:24:15 +02:00
abac96f41d
Update banner from remote accounts.
2017-09-16 13:16:54 +02:00
0872f5f394
Add undocumented default user default settings.
2017-09-16 11:52:33 +02:00
5602293690
Fix callback state.
2017-09-16 11:37:55 +02:00
c36229c4aa
Add remote user fetching to search.
2017-09-16 11:26:20 +02:00
73bdfd6c2b
Set search config to 'english'.
2017-09-16 10:50:43 +02:00
9f0a2a714b
Add basic search.
2017-09-16 10:42:24 +02:00
d659fcc195
MastoAPI: Fix date in account view.
2017-09-15 17:50:47 +02:00
c20530e708
Add configuration option for registrations.
2017-09-15 14:39:32 +02:00
50409326a8
Refactor posting and make character limit configurable.
2017-09-15 14:17:36 +02:00
ac2893a945
Add instance config options.
2017-09-15 10:26:28 +02:00
3aaf6608c6
MastoAPI: Set user id on replies.
2017-09-15 08:49:31 +02:00
f445a1b376
Don't die on fetching problems.
2017-09-15 08:18:29 +02:00
3ca853fb61
MastoAPI: Follower-related changes
2017-09-14 18:30:05 +02:00
fc85c9f086
Add tag timelines.
2017-09-14 13:22:09 +02:00
b0363e8055
MastoAPI: Add favourited_by/reblogged_by.
2017-09-14 09:50:49 +02:00
ac3f32da7e
Preserve state in oauth
2017-09-14 09:29:51 +02:00
a8701282d4
MastoAPI: fake out 'application' property.
2017-09-14 09:14:08 +02:00
6258c6b6b3
MastoAPI: Also return text_url in attachments.
2017-09-14 08:38:48 +02:00
641c24cdd4
Add media upload endpoint.
2017-09-14 08:08:32 +02:00
3184939055
Ensure non-null bio.
2017-09-13 17:45:59 +02:00
d168ef5a9e
MastoAPI: Add accounts getting.
2017-09-13 17:36:02 +02:00
ad5001828e
Oh no! More datetime fixes!
2017-09-13 17:18:08 +02:00
14b4029b1d
Reparse time to ensure correct format.
2017-09-13 16:38:29 +02:00
94be93aad0
Allign datetime format with mastodon.
2017-09-13 16:26:02 +02:00
d2faee01ee
Return iso8601 date.
2017-09-13 16:09:57 +02:00
e6286152b9
Fix logic.
2017-09-13 16:05:39 +02:00
49929321c7
Add relationships to masto api.
2017-09-13 15:55:10 +02:00
f03524805f
Try host-meta call over https.
2017-09-13 11:59:56 +02:00
07b694814e
Optimize conversation fetching.
2017-09-12 13:48:48 +02:00
1bc58230ee
Remove milliseconds from mastodon api response.
2017-09-12 13:31:17 +02:00
7331733d30
Use signed integer as attachment id.
2017-09-12 11:43:36 +02:00
b58b35bf56
Use hash of attachment url as id.
...
Pretty hacky, let's see if we can get away with this.
2017-09-12 11:28:12 +02:00
44a650235b
MastoAPI: Remove domain ending from account name.
2017-09-12 09:34:39 +02:00
cda01285f4
Add pagination to notifications.
2017-09-12 09:11:36 +02:00
f1d9f2f6cd
MastoAPI: More link headers.
2017-09-12 09:06:32 +02:00
0df4a0f26d
Add parentheses.
2017-09-12 08:53:21 +02:00
02f824f9d5
MastoAPI: Add link headers to home timeline
2017-09-12 08:51:56 +02:00
cd6cba2f67
log ostatus handling errors.
2017-09-11 21:50:46 +02:00
f0d41a3abf
Merge branch 'develop' into oauth2
2017-09-11 20:54:44 +02:00
464c33e9a1
Add follow notifications.
2017-09-11 20:53:11 +02:00
3bad294058
Add reblogs to notifications.
2017-09-11 20:43:25 +02:00
bcce3e5dd2
Add favorites to notifications.
2017-09-11 20:41:05 +02:00
61adf676d5
Add basic mastodon notification support.
2017-09-11 18:53:19 +02:00
7616b202ea
Add user timelines to Masto Api.
2017-09-10 17:49:13 +02:00
b8912ff954
Fix masto api context.
2017-09-10 17:20:53 +02:00
8672d4d12b
Add context to mastodonAPI.
2017-09-10 15:00:13 +02:00
fc10875895
Add attachments to mastoapi statuses.
2017-09-10 11:51:01 +02:00
96473dfac0
Reverse mastodon timeline data.
2017-09-10 10:49:15 +02:00
e8975d06be
Add header image to masto api.
2017-09-10 10:37:34 +02:00
d66d69c3b4
Small hack to make notifications return empty for now.
2017-09-09 19:19:13 +02:00
5fe9e4dd3f
Do oauth redirect.
2017-09-09 19:03:57 +02:00
d625d8db7d
Add unfav to Mastodon API.
2017-09-09 18:30:02 +02:00
454dc18570
Add favoriting to Mastodon API.
2017-09-09 18:09:37 +02:00
66e4c710d4
Add reblogging to MastodonAPI.
2017-09-09 17:48:57 +02:00
4dc517a0bb
Add deletion to masto api.
2017-09-09 13:56:51 +02:00
be04f725e9
Add more Mastodon API methods.
2017-09-09 13:15:01 +02:00
59dd240c08
Use token exchange method.
2017-09-09 12:10:46 +02:00
2b7efff71b
Add Mastodon StatusView.
2017-09-09 12:10:29 +02:00
c6bdc5960c
Test for Mastodon AccountView
...
Handles users and mentions.
2017-09-09 12:09:53 +02:00
a22f2e683b
Add type restriction to activitypub fetcher
...
Mainly because Mastodon only returns notes, not the other activities.
2017-09-09 12:05:17 +02:00
95cedd6000
Make auth tokens usable once and expire them.
2017-09-09 12:02:59 +02:00
95aa6a3c65
Try to fetch from html again if fetching from atom gives no results.
2017-09-08 09:08:31 +02:00
2652d9e4ed
Slight cleanup.
2017-09-07 08:58:10 +02:00
2a298d70f9
Add very basic oauth and mastodon api support.
2017-09-06 19:06:25 +02:00
a441ee7d21
Workaround for masto reply breakage.
2017-09-05 14:01:37 +02:00
e9ebfdb83b
Fix remote profile update code.
2017-09-05 11:40:34 +02:00
632e1f7943
Add delete to TwAPI representer correctly.
2017-09-04 20:48:29 +02:00
1f9a5272e1
Add delete to TwAPI.
2017-09-04 20:48:14 +02:00
3438a120cc
Don't delete new delete activity...
2017-09-04 20:47:43 +02:00
fcf3128a56
Add TwAPI representer for deletes.
2017-09-04 20:03:28 +02:00
2348b272e0
Create deletes activities for incoming deletes.
2017-09-04 18:47:46 +02:00
5db535c0b1
Add delete to ActivityPub.
2017-09-04 18:47:33 +02:00
540dfb4617
Add delete activity representer.
2017-09-04 17:56:09 +02:00
10e40206c6
Output mastodon-style conversation ids.
2017-09-04 11:04:04 +02:00
1b1f861bad
Handle mastodon conversation ids.
2017-09-04 11:03:51 +02:00
6c3a0ffae4
Add banner and background updating.
2017-08-29 17:18:33 +02:00
5142a8efbb
Add profile update.
2017-08-29 15:14:00 +02:00
171ef33cbb
More sensible attachment names.
2017-08-28 19:17:38 +02:00
fecbd099cd
Ignore padding for salmon public keys.
2017-08-25 15:09:05 +02:00
67bfa19b35
Set twitter-style possibly_sensitive boolena.
2017-08-24 16:27:37 +02:00
5dc278b1a6
Add activity_type to twitter api output.
2017-08-24 16:18:26 +02:00
d95b78c72f
Remove email from mastoinfo.
2017-08-24 14:19:54 +02:00
d1f86ad69f
Basic masto-style info.
2017-08-24 14:15:16 +02:00
8a97bebc53
More meta info fixes.
2017-08-24 14:07:05 +02:00
7ccdebe180
Small meta info fixes.
2017-08-24 13:36:28 +02:00
08bd59e446
Extend webfinger capabilities.
2017-08-24 12:54:53 +02:00
1a001588e8
Don't break on empty mentions.
2017-08-24 12:54:01 +02:00
e477608b7e
add correct content type for catch-all
2017-08-22 14:22:36 +02:00
8004ee8ccf
Merge branch 'patch-1' into 'develop'
...
Fix finmoji title attribute.
See merge request !23
2017-08-18 05:33:42 -04:00
552cfdbe11
Fix deletion not deleting relevant actions.
2017-08-16 16:29:25 +02:00
2ab1d915e3
Use unicode regex in mentions and links.
2017-08-14 17:56:45 +02:00
7d34cec58d
escape attachment urls on creation.
2017-08-09 16:55:18 +02:00
a32784fe6d
Cowboy and Elixir don't seem to agree on uri encoding...
2017-08-09 16:45:05 +02:00
9c35456d77
URI encode filenames...
2017-08-09 15:21:34 +02:00
9fd8640202
Order by id instead of inserted_at to better use indexes.
2017-08-08 12:24:20 +02:00
763756f879
Also fetch atom links.
2017-08-04 16:57:38 +02:00
27b8e3affb
Revert "Better error handling for user feeds."
...
This reverts commit 11714fbaa2
2017-08-03 17:49:18 +02:00
11714fbaa2
Better error handling for user feeds.
2017-08-03 17:46:01 +02:00
7b0dd964be
Slightly nicer webfinger error handling.
2017-08-03 14:14:48 +02:00
571f07abe3
Try refresh all invalid subscriptions.
...
This is a temporary fix to prevent intermittent problems from cutting
off subscriptions.
2017-08-02 12:42:12 +02:00
e4a4135c1d
Handle subscriptions in queue.
2017-08-02 12:34:48 +02:00
54af9e145a
Add some debug info to websub.
2017-08-02 12:03:45 +02:00
25c733f402
Add href to in-reply-to.
...
THis should enable fetching from pleroma posts.
2017-08-01 17:35:19 +02:00
f226f46a09
Add basic incoming deletions.
2017-08-01 17:05:07 +02:00
558ab6e74e
Display html links correctly for remote activies.
2017-08-01 14:05:18 +02:00
c3dfa1970f
Don't crash on activity handling problems.
2017-08-01 12:41:46 +02:00
368fa25f1f
Strip all newlines in atom html content to work around mastodon bug.
2017-07-31 13:31:21 +02:00
00b722430f
Revert "Close br tags."
...
This reverts commit 2eba8e74cc
2017-07-31 13:27:38 +02:00
19e8421947
Revert "Wrap in <p>."
...
This reverts commit c81d0b6f89
2017-07-31 13:27:29 +02:00
3063e3b440
Revert "Remove newlines completely so mastodon doesn't bug out."
...
This reverts commit 0ca3ab7b59
2017-07-31 13:27:19 +02:00
0ca3ab7b59
Remove newlines completely so mastodon doesn't bug out.
2017-07-31 13:06:31 +02:00
c81d0b6f89
Wrap in <p>.
2017-07-31 12:16:44 +02:00
2eba8e74cc
Close br tags.
2017-07-31 10:46:29 +02:00
fc269fd319
Add html alternate link to atom.
2017-07-29 22:07:02 +02:00
72ca58c540
Save follower count and note count in user.
2017-07-22 17:42:15 +02:00
a027b0027c
Add friends endpoint.
2017-07-20 20:35:30 +02:00
94a394e3a8
Add followers endpoint.
2017-07-20 20:29:15 +02:00
44aef2183e
Add follower / friend fetching to user.
2017-07-20 19:37:41 +02:00
140f72725d
Use follower address in user entry.
2017-07-19 19:06:49 +02:00
396c32a6da
Add follower_address to users, add on generation.
2017-07-19 18:49:25 +02:00
6c70980bff
Fix finmoji title attribute.
2017-07-09 11:00:02 -04:00
7e9647b146
Fix undo activity.
2017-07-08 11:17:35 +02:00
e343c0c9c4
Add way to update most recent notification id.
2017-07-02 15:01:59 +02:00
5e17e04144
Make user timelines faster for users with few statuses.
2017-07-01 16:43:10 +02:00
ac04ba240a
Larger bio length limit for remote accounts.
2017-07-01 02:00:12 +02:00
9bdea19d83
For non-create activities, grab the create activity to fav/rt
2017-06-30 16:59:54 +02:00
cd522d2139
Also fetch posts by id in fav/rts.
2017-06-30 16:53:25 +02:00
201804b836
Only return posts in TwAPI conversations.
2017-06-30 16:41:09 +02:00
d4de38e8ff
Order conversation fetches like GS does.
2017-06-30 16:30:19 +02:00
fc7016a88c
Don't add public recipient to notes that don't contain it.
2017-06-30 15:54:32 +02:00
d8bbbeb03a
Bio can actually be nil.
2017-06-26 17:00:58 +02:00
1c074efeaf
Add external links to twapi.
2017-06-25 12:07:08 +02:00
429992fcc9
Save external link for notes.
2017-06-25 11:57:34 +02:00
39bacba280
More resilient xml parsing.
2017-06-24 14:35:32 +02:00
6935fc3e01
Update user data on fetch if it changed.
2017-06-24 13:09:46 +02:00
ffc9d7708b
Handle webpubs in queue.
2017-06-23 16:37:34 +02:00
6ee0ca21e2
Some salmon debug fixes.
...
Plus httpoison update.
2017-06-23 16:22:19 +02:00
4ba6746820
use correct arity .post.
2017-06-23 12:27:40 +02:00
6a184115a2
Longer timeouts for outgoing federation.
2017-06-23 12:25:53 +02:00
42633406b3
Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into develop
2017-06-20 17:49:15 +02:00
14d9de39e8
Better debugging.
2017-06-20 17:28:36 +02:00
b76001ded3
Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into develop
2017-06-20 17:57:04 +03:00
08e53df91e
Move util functions to UtilController
2017-06-20 17:55:57 +03:00
9cf38d6796
Use more efficient queries.
2017-06-20 16:18:42 +02:00
14a9dd468b
Use more efficient query.
2017-06-20 16:02:17 +02:00
fe27b61a72
Add some debugging to federations.
2017-06-20 14:10:44 +02:00
1e6491ec96
Merge branch 'develop' into refactor/user-view
2017-06-20 11:49:41 +02:00
af49c11193
Work around upserting problems in context mapping.
2017-06-20 09:50:22 +02:00
069daf644d
Replace UserRepresenter with UserView
2017-06-20 00:12:37 +03:00
45c751985e
Move finmojis to representation.
2017-06-19 18:06:58 +02:00
66b4fee80e
Add finmoji.
2017-06-19 17:51:43 +02:00
6cac8e3c8b
Downcase tags coming in through the TwAPI.
2017-06-18 19:04:46 +02:00
5ff4a5eee3
Save incoming tags as lowercase.
2017-06-18 19:01:54 +02:00
fa82822932
Revert "Add invisible tags to TwAPI output."
...
This reverts commit a92a9dce94
2017-06-18 18:59:13 +02:00
d00571ff75
Fetch user feed on externalprofile request.
...
This is so we always have something to show.
2017-06-18 17:20:39 +02:00
fafb765c48
Output tags list in TwAPI.
2017-06-18 14:43:44 +02:00
8feec8d390
Strip unsafe html on output in TwAPI.
2017-06-18 13:40:35 +02:00
a9bfbcae80
Slightly better html link regex.
2017-06-18 13:29:30 +02:00
7b41e103e1
Remove html from user bios on display.
...
This is mainly to fix problems of bios coming from mastodong.
2017-06-18 13:17:35 +02:00
83c657afa5
Do some basic escaping.
2017-06-14 14:46:18 +02:00
1af9c77736
Move mention parsing to Formatter module.
2017-06-14 13:58:56 +02:00
eb18b9ebba
Enable user timelines.
2017-06-12 17:12:55 +02:00
a1cabeea4a
Redirect html user profile request.
2017-06-12 12:52:40 +02:00
6342fcd5dc
Save correct date for incoming notes.
2017-06-08 16:44:12 +02:00
00c032783d
Fix NaN statuses per day.
2017-06-05 15:47:37 +02:00
cdcb201bf5
Represent object publishing date in notes.
2017-06-02 22:47:49 +02:00
c7fdd1b7ff
Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into develop
2017-06-01 11:24:03 +02:00
4cfe1e0c9b
Make timeouts longer, some servers are very slow.
2017-05-31 18:24:50 +02:00
80705c7a20
Redirect to frontend on html notice path.
2017-05-31 17:48:22 +02:00
c6aa60c829
Shorten names in links.
2017-05-30 14:26:31 +02:00
bdcf42180f
Save remote user bio and update if we see new data.
2017-05-24 17:34:38 +02:00
94e980d6b4
Output proper published data in ostatus.
2017-05-24 13:54:25 +02:00
4854a604ef
Extract note handler.
2017-05-20 13:41:33 +02:00
1085675ec4
Output ref instead of href for conversation.
2017-05-20 10:44:57 +02:00
9d97be4413
Try fetching shares.
2017-05-19 16:08:46 +02:00
03b7b2fa24
Also show activities in OStatus.
2017-05-19 15:53:02 +02:00
8e02fa100f
Add categories to ostatus output.
2017-05-18 18:18:27 +02:00
b74125900c
save correct inReplyToStatusId.
2017-05-18 17:03:21 +02:00
042cdf09ca
Wire up inReplyToStatusIds for ostatus.
2017-05-18 16:58:30 +02:00
48f9df2391
Keep newlines around.
2017-05-18 16:41:16 +02:00
a92a9dce94
Add invisible tags to TwAPI output.
2017-05-18 16:24:41 +02:00
beb7b0ef07
Handle incoming tags.
2017-05-18 15:58:18 +02:00
0da6ade619
Save tags in object.
2017-05-18 15:16:49 +02:00
9033bfffd2
Twitter API refactoring.
2017-05-17 18:00:20 +02:00
dcfd494e97
Add Formatter.
2017-05-17 18:00:09 +02:00
70024632ba
AP refactoring.
2017-05-16 18:19:04 +02:00
423194520e
Fix mention replacing.
2017-05-15 18:25:21 +02:00
d95ac274d6
On user making, check if we have a user with that uri.
2017-05-12 18:58:25 +02:00
04544da8f1
Fetch user on externalprofile if we don't know him
2017-05-12 18:50:47 +02:00
dd12cf7296
Fix cws.
2017-05-11 17:59:11 +02:00
932e0e87db
More debugging code.
2017-05-11 09:34:11 +02:00
2154f729b0
Don't fetch if we don't even have a inReplyTo.
2017-05-11 09:32:03 +02:00
312772df7c
Add debugging help.
2017-05-11 09:13:14 +02:00
1b67a59795
Repair retweets.
2017-05-10 19:29:25 +02:00
9f15937fe6
Actually guess 3 days...
2017-05-10 19:12:40 +02:00
d2c4a427f1
Only try refreshing every 6 hours.
2017-05-10 19:08:42 +02:00
ae0e6d8003
Handle cases where we don't get lease_seconds returned.
2017-05-10 19:04:27 +02:00
153995f832
Correct active state websub name.
2017-05-10 18:54:43 +02:00
05f2cd0d93
Handle incoming follows.
...
Also Mastodon CWs.
2017-05-10 18:46:23 +02:00
34a1ce00ec
Set valid_until date.
2017-05-10 18:45:55 +02:00
a2ca3b8605
Add option to keep id for follows.
2017-05-10 18:45:38 +02:00
36448d6483
Add externalprofile to TwAPI.
2017-05-10 18:44:57 +02:00
2e753e8cd7
Refresh subscriptions.
2017-05-10 18:44:06 +02:00
fca7390c69
Only kick off websubs for local users.
2017-05-10 18:43:14 +02:00
118c572006
Use changeset for remote user creation.
2017-05-10 10:16:20 +02:00
373753e595
Add some basic changesets.
2017-05-09 18:11:51 +02:00
e12a6d5666
Get fresh objects on changes.
...
This will count retweets / favs correctly again.
2017-05-09 18:11:11 +02:00
71362acb93
Quick fix for database filling.
2017-05-09 00:20:05 +02:00
1418d72749
Add class=attachment to attachment links.
2017-05-08 20:12:36 +02:00
8f9c43343e
Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into develop
2017-05-08 19:35:16 +02:00
3320c9b176
Fix remote users retweeting local stuff.
2017-05-08 18:19:45 +02:00
b9da7d3219
typo.
2017-05-07 20:30:34 +02:00
7303786160
Add some twapi fixes.
2017-05-07 20:20:53 +02:00
e49770ee88
Add some debugging info.
2017-05-07 20:16:07 +02:00
db08498a9f
Prevent double insertions.
2017-05-07 20:13:10 +02:00
4f9328c622
Preserve ids on favorites / retweets.
2017-05-07 20:05:03 +02:00
b403ea4d2b
Merge branch 'develop' into dtluna/pleroma-feature/unfollow-activity
2017-05-07 19:28:23 +02:00
60b4b0d725
Safety measures.
2017-05-07 14:52:19 +02:00
a41aa4e489
Federate follow salmons.
2017-05-07 14:45:37 +02:00
95ab0dc3c5
Add conversation ids to twapi announce representer.
2017-05-07 12:46:21 +02:00
c51e15975a
Fix user fetching error.
2017-05-07 12:45:37 +02:00
fcd34096db
Add one more alias for twapi twkn.
2017-05-06 22:26:36 +02:00
7db76a0f0e
Address incoming messages to followers.
2017-05-06 14:23:39 +02:00
bda389d7d9
Subscribe to remote users on following.
2017-05-06 14:09:39 +02:00
9cafb67fc1
Follow redirects when fetching activities.
...
This can happen for site that started as http and now switched to https.
2017-05-06 13:18:08 +02:00
22ddddce76
Handle incoming items through the queue.
2017-05-06 12:34:40 +02:00
7e65cad9fe
Do recursive fetching in-band for now.
...
This is to prevent conversation id problems.
2017-05-06 12:15:48 +02:00
04f6ece99e
Send salmons and websub in background tasks.
2017-05-05 20:38:10 +02:00
7752f103f6
Add basic thread fetching.
2017-05-05 20:15:26 +02:00
00a7183118
Basic queue.
2017-05-05 18:58:29 +02:00
2d9fdbcc0d
Don't call out if we have the favorited notice locally.
2017-05-05 16:27:03 +02:00
fa2610c795
Handle incoming favorites, fetch potentially missing messages.
2017-05-05 16:07:44 +02:00
d982f04a65
Mock HTTPoison in testing.
2017-05-05 14:16:54 +02:00
7269c51f3a
Some refactoring.
2017-05-05 12:07:38 +02:00
c48c381e90
Merge branch 'develop' into dtluna/pleroma-refactor/1
2017-05-05 11:46:59 +02:00
c85998ab8a
Parse incoming retweets.
2017-05-04 18:42:29 +02:00
5d9f3df714
Just sign with an empty string if needed.
2017-05-04 09:57:11 +02:00
151da344be
Add debugging logs.
2017-05-04 09:54:22 +02:00
97257c692c
Fix specs.
2017-05-03 20:06:20 +02:00
1077c5c58d
Remove reply-to for shares, mastodon gets confused.
2017-05-03 20:06:00 +02:00
53d05af5b6
Fix Mastodon signature bug.
2017-05-03 19:23:12 +02:00
5d7831ee3e
Add self links to federated statuses.
2017-05-03 18:10:19 +02:00
b34b046f16
Add user to announced status.
2017-05-03 17:51:36 +02:00
861a294cda
Add announce federation.
2017-05-03 17:41:55 +02:00
138641589d
OStatus announce representer.
2017-05-03 17:39:12 +02:00
df71c142cf
Remove doubled 'to' recipients.
2017-05-03 16:08:24 +02:00
8141024259
Attachment parsing, better magic key fetching.
2017-05-03 14:26:49 +02:00
16afea399d
Just give out the entry, not the whole feed.
2017-05-03 10:02:29 +02:00
9c42453e06
Return note objects as ostatus post activities.
2017-05-03 09:54:17 +02:00
018a1a390f
Use inReplyTo to find context.
2017-05-02 21:31:01 +02:00
33c803d6da
Add attachment link to posts.
2017-05-02 18:25:39 +02:00
b104348fa5
Follow webfinger redirects.
2017-05-02 17:44:55 +02:00
96014f8e0b
Update incoming new avatars.
2017-05-02 17:16:01 +02:00
102455bf29
Add avatar updating from incoming messages.
2017-05-02 17:13:41 +02:00
945b4b55e6
Federate likes.
2017-05-02 16:45:54 +02:00
93de603966
Add an ostatus representer for like activities.
2017-05-02 16:35:53 +02:00
a3e82c5c24
Save context in likes / announces.
2017-05-02 15:54:14 +02:00
16f8406eb6
Add statusnet_profile_url to the TwAPI.
2017-05-02 14:36:04 +02:00
32a95d73da
Add twkn timeline.
2017-05-02 14:12:43 +02:00
6dd8335477
Mark incoming activties as non-local.
2017-05-02 10:47:04 +02:00
56bacc90d1
Fix specs, add local marker to actitivies.
2017-05-02 10:43:35 +02:00
89c1e90eb2
Don't crypt raw iolists.
2017-05-01 22:02:07 +02:00
8ae13d94dc
Use empty context id if we get none
...
Thanks mastodon.
2017-05-01 20:38:01 +02:00
aa20941416
Some servers send empty lease_seconds requests...
2017-05-01 20:09:00 +02:00
703d9f3628
Not enough h.
2017-05-01 20:04:32 +02:00
76e653b0d8
Add user profile page link.
2017-05-01 20:02:32 +02:00
ceb2f68432
Add type to rel=self link in feed.
2017-05-01 18:40:36 +02:00
e88062494e
Revert "Also accept user id as feed topic."
...
This reverts commit 97d11dec0e
2017-05-01 18:34:15 +02:00
97d11dec0e
Also accept user id as feed topic.
2017-05-01 18:07:50 +02:00
92a8944dfe
Redirect to user feed instead of directly serving it.
2017-05-01 18:05:02 +02:00
1854842b09
Log subscription error.
2017-05-01 17:28:49 +02:00
108573265a
Don't commit nil values in object cache.
2017-05-01 16:28:40 +02:00
3cb518270a
Remove superfluous transaction.
2017-05-01 16:15:21 +02:00
f169de3454
Cache objects in dev and prod.
2017-05-01 16:12:20 +02:00
d187a4965f
Return feed for xml requests of the user.
2017-05-01 14:07:41 +02:00
35938656ab
Make user keys on usage.
2017-05-01 14:07:29 +02:00
e54e592d6c
Return webfinger for ap_ids.
2017-05-01 13:51:17 +02:00
6843755834
Make outgoing salmons work.
2017-05-01 13:14:58 +02:00
bed0b39813
Add function to fetch users from fqn.
2017-04-30 18:48:48 +02:00
eb12a89d22
Rename wrongly-named function.
2017-04-30 15:06:22 +02:00
a173fb9e41
Get users fresh, might so we don't make new keys all the time.
2017-04-30 15:05:16 +02:00
bb1d08a47c
Return keys in webfinger.
2017-04-30 15:00:04 +02:00
09f7ed4214
Don't set statusnetConversationIds on replies anymore.
2017-04-30 14:26:29 +02:00
009fcd2acf
Stop adding statusnetConversationIds.
2017-04-30 14:02:04 +02:00
379caca01d
Wrap context creation in transaction.
2017-04-30 13:58:40 +02:00
4c8111c334
Use conversation mapping objects to get / retrieve context from TwAPI.
2017-04-30 13:53:26 +02:00
f9912599c4
Pull in remote avatar on federation.
2017-04-30 12:53:49 +02:00
18edc299b2
Handle duplicates.
2017-04-30 12:36:47 +02:00
62607f37dc
Federate object id for posts in ostatus.
...
This is because ostatus doens't have an id for the activities.
2017-04-30 11:55:19 +02:00
84027ff00b
Handle comments.
2017-04-30 11:39:27 +02:00
d937a8e695
Add thr:in-reply-to to ostatus representer.
2017-04-30 11:17:34 +02:00
9d7c3190cc
Get create activity from created object id.
...
This is useful for Ostatus federation because ostatus doesn't have
different ids for objects and activities...
2017-04-30 11:16:41 +02:00
11ea08649d
Make cache bigger and longer lived.
2017-04-30 10:06:57 +02:00
ffc604a2c2
Use cache for user info data.
...
Later these should be persisted in the user.
2017-04-30 10:04:54 +02:00
8a0d2b33d8
Keep ostatus id as activity id.
2017-04-30 09:25:46 +02:00
a16da387d2
Handle full incoming feeds.
2017-04-29 21:13:21 +02:00
20015b4b67
Save remote users with fqn as nickname.
2017-04-29 20:08:45 +02:00
ba1ea77001
Make key fetching use ostatus fetching.
2017-04-29 19:47:56 +02:00
427bac0966
Rework remote user subscription.
2017-04-29 19:06:01 +02:00
69922bc724
Add user info gathering.
2017-04-29 17:51:59 +02:00
ca40dda04c
Add some basic webfingering.
2017-04-28 17:41:12 +02:00
59d4cc6036
normalize hex number.
2017-04-28 15:53:45 +02:00
1422e7aa84
Handle incoming websub subscriptions.
2017-04-28 15:45:10 +02:00
a9b2ad1759
Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into feature/unfollow-activity
2017-04-28 16:06:57 +03:00
451d18af63
Add proper callback route for websub confirmation.
2017-04-28 09:51:47 +02:00
6cf7c13228
Refactor code to comply with credo suggestions
2017-04-27 16:18:50 +03:00
90da25505f
Add discovery and subscription requests to websub.
2017-04-27 09:46:45 +02:00
e8a311ecff
Add user and hub to websub client subscriptions.
2017-04-27 09:44:20 +02:00
d1dce56a85
Refactor XML parsing.
2017-04-27 09:43:58 +02:00
9e9d95ec99
Merge branch 'feature/incoming_ostatus' of ssh.gitgud.io:lambadalambda/pleroma into feature/incoming_ostatus
2017-04-26 19:17:51 +02:00
7561158ab1
Merge branch 'feature/incoming_ostatus' of ssh.gitgud.io:lambadalambda/pleroma into feature/incoming_ostatus
2017-04-26 18:34:14 +02:00
c5fa682c31
Refactor, add beginnings of websub client subscriptions.
2017-04-26 18:33:10 +02:00
57bd59e407
Salmon creation.
2017-04-26 14:25:44 +02:00
f1ebf812ee
Add inReplyTo to incoming messages.
2017-04-26 10:22:51 +02:00
d9ebd785ab
Ostatus doesn't distinguish between activities / objects on create.
2017-04-26 10:08:13 +02:00
e8882ab3da
Merge branch 'develop' into feature/incoming_ostatus
2017-04-26 09:18:49 +02:00
fb5cebc1b5
Merge branch 'dtluna/pleroma-bugfix/deny-self-repeats' into develop
2017-04-26 08:56:34 +02:00
c844799822
Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into develop
2017-04-26 08:56:18 +02:00
2f0e13abe2
Merge branch 'develop' into dtluna/pleroma-bugfix/deny-self-repeats
2017-04-26 08:49:26 +02:00
b91ccef237
Output conversation id.
2017-04-26 08:47:22 +02:00
c3655d1c47
Remove unnecessary status_update definition
2017-04-25 19:47:16 +03:00
f980f6778b
Wire up mentions.
2017-04-25 18:03:14 +02:00
b438ea24ee
Add ostatus conversation as context.
2017-04-25 17:45:34 +02:00
6c5f5e18ec
Even more refactoring.
2017-04-25 17:36:53 +02:00
4771962a5d
More refactoring.
2017-04-25 17:32:36 +02:00
ef4190b3ab
Clean up status create method.
2017-04-25 17:26:05 +02:00
a25adfbfee
Remove superflous function.
2017-04-25 11:33:32 +02:00
6529cab982
Merge branch 'develop' into dtluna/pleroma-bugfix/deny-empty-posts
2017-04-25 11:09:14 +02:00
ab0114fbaa
Return salmon path for users, basic incoming salmon handling.
2017-04-24 18:46:34 +02:00
668b01da0b
Add restriction on names
2017-04-24 15:34:54 +03:00
42105497ca
Merge branch 'bugfix/deny-empty-posts' of ssh.gitgud.io:dtluna/pleroma into bugfix/deny-self-repeats
2017-04-24 14:17:23 +03:00
5b6070ec40
Deny whitespace statuses
2017-04-24 12:09:11 +03:00
43d7a4b2cf
Add basic fields to support remote users.
2017-04-24 08:49:09 +02:00
f723b23691
Add error response to self-repeats
2017-04-24 01:11:38 +03:00
6b6bc9435c
Merge branch 'bugfix/deny-empty-posts' of ssh.gitgud.io:dtluna/pleroma into bugfix/deny-self-repeats
2017-04-24 01:05:02 +03:00
1e3791877c
Add error response on empty status
2017-04-23 19:08:25 +03:00
7424310e14
Basic key fetching.
2017-04-23 16:35:17 +02:00
a3b9741a62
Merge branch 'feature/follow-unfollow-by-screen-name' into 'develop'
...
Follow and unfollow using screen_name
See merge request !9
2017-04-23 10:26:27 -04:00
4c216cba9c
Decode and verify salmons.
2017-04-23 15:21:58 +02:00
8a07ddef8f
Don't break feed if user has no posts.
2017-04-23 10:38:24 +02:00
cef4a4d709
Fix utf8 problems with iolists.
2017-04-22 15:34:29 +02:00
04fb4f9c47
Add poco data to user.
2017-04-22 15:11:13 +02:00
923584d046
Remove unknown activities from feed.
2017-04-22 14:37:54 +02:00
c585f9e26c
Only handle subscription requests for now.
2017-04-22 13:48:10 +02:00
8fb73c28bb
Only have one subscription per callback.
2017-04-22 13:44:21 +02:00
1feb193731
Add rel=self link too feed.
2017-04-22 12:11:36 +02:00
ece85fc8bc
Add attachments to feed.
2017-04-22 12:09:13 +02:00
a2b79ce7d1
Add outgoin federation to twitter api.
...
Doesn't really belong there, find a different place for it. Should
federate on every activity insertion.
2017-04-22 12:08:20 +02:00
77cb260628
add basic federation to websub.
2017-04-22 12:07:51 +02:00
39dc74f967
Add callback to websub subscription.
2017-04-22 12:05:48 +02:00
28b203d08f
Add Undo of Follow Activity insertion
2017-04-21 19:54:21 +03:00
1c00eb4a90
Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into ostatus
2017-04-21 18:42:28 +02:00
a9b3f99d48
Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into feature/follow-unfollow-by-screen-name
2017-04-21 18:36:03 +03:00
f51a672ac4
Return object id in Ostatus create activties.
2017-04-21 04:22:02 +02:00
424e0e7779
Add Websub verification.
2017-04-21 03:59:11 +02:00
9afc672009
Quick fix for activities without 'to'.
2017-04-21 01:01:58 +02:00
1e88f102c4
Fix specs, add some user info.
2017-04-21 00:51:09 +02:00
7a018a8d3b
Add /statuses/mentions_timeline route
2017-04-21 00:29:08 +03:00
1b9cc721a0
Websub controller beginnings.
2017-04-20 17:47:33 +02:00
3a56d7318f
Add statuses/mentions endpoint
2017-04-20 15:18:54 +03:00
5e7ceeba94
Merge branch 'ostatus' of ssh.gitgud.io:lambadalambda/pleroma into ostatus
2017-04-20 10:16:41 +02:00
cc330421fd
Better activities in ostatus.
2017-04-20 10:16:06 +02:00
b248fc7dfb
Refactor unfollow/2
2017-04-20 10:57:37 +03:00
01901d9835
Merge branch 'feature/unfollow-by-screen-name' of ssh.gitgud.io:dtluna/pleroma into feature/follow-unfollow-by-screen-name
2017-04-20 10:46:27 +03:00
d952b6cd7b
Merge branch 'feature/follow-by-screen-name' of ssh.gitgud.io:dtluna/pleroma into feature/follow-unfollow-by-screen-name
2017-04-20 10:39:18 +03:00
9167a2ebe3
Send frontend through phoenix.
2017-04-19 15:25:18 +02:00
eda742c78b
Merge branch 'feature/user-timeline' into 'develop'
...
Feature/user timeline
See merge request !8
2017-04-19 05:50:24 -04:00
d23f3e3cf3
Add webfinger and basic feed support.
2017-04-18 18:41:51 +02:00
36e883cd4b
Add basic Ostatus user representer.
2017-04-17 14:12:36 +02:00
ce6cc84a4a
Add basic webfinger.
2017-04-17 13:44:41 +02:00
ac9817bdb0
Merge branch 'bugfix/repeated-follow-unfollow' into 'develop'
...
Add error messages for repeated follows and unfollows
See merge request !7
2017-04-17 05:46:59 -04:00
a185ea63af
Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into develop
2017-04-17 11:37:21 +02:00
6bfd521974
Switch cache implementation for size limiting.
2017-04-17 11:36:17 +02:00
ef5033d7a7
Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into bugfix/repeated-follow-unfollow
2017-04-16 17:18:34 +03:00
f6547f7b7f
Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into feature/unfollow-by-screen-name
2017-04-16 17:13:42 +03:00
82914e1e4d
Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into feature/follow-by-screen-name
2017-04-16 17:12:28 +03:00
85bd480be3
Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into feature/help-test
2017-04-16 17:10:25 +03:00
5229b01944
Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into feature/user-timeline
2017-04-16 17:08:17 +03:00
eb9358c8d6
Add basic Avatar updating code.
2017-04-16 16:06:19 +02:00
63f04b314d
Fix typo
2017-04-16 17:05:48 +03:00
4b4ece2c74
Add user timeline fetching without credentials
2017-04-16 16:44:30 +03:00
03a9c11d25
Display the users avatar if he has one set.
2017-04-16 15:40:50 +02:00
d7e3b72c6a
Add avatar objects to user, fix specs.
2017-04-16 15:28:28 +02:00
7617a593b9
Support data uris in uploads.
2017-04-16 14:23:30 +02:00
7a0046d127
Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into feature/user-timeline
2017-04-16 13:32:56 +03:00
9a8c348aed
Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into feature/unfollow-by-screen-name
2017-04-16 13:28:23 +03:00
ce1eef9c98
Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into feature/help-test
2017-04-16 13:25:38 +03:00
b41f3eff84
Preserve newlines in messages.
2017-04-16 11:51:00 +02:00
5dac3727f1
Add registration to the TwAPI controller.
2017-04-16 11:01:24 +02:00
b1edd94baa
Add user registration to TwAPI.
2017-04-16 10:25:27 +02:00
40706b4c4f
Use changeset in user registration mix task.
2017-04-15 16:42:02 +02:00
03c6148bb3
Add user registration changeset.
2017-04-15 16:40:09 +02:00
4f7adb343c
Address liking / announcing to the original author.
2017-04-15 14:16:01 +02:00
4799dc6991
Add retweeting to TwAPI controller.
2017-04-15 14:09:54 +02:00
60c60de330
Add announcements / retweets to TwAPI.
2017-04-15 13:54:46 +02:00
21c397820f
Add announcements to activitypub.
2017-04-15 12:11:20 +02:00
7a47afed3c
Update object correctly after setting context.
2017-04-14 18:59:11 +02:00
c83f279a7d
Add unliking to TwAPI controller.
2017-04-14 18:27:17 +02:00
f4eea0847b
Add unfavoriting to TwAPI.
2017-04-14 18:15:15 +02:00
a926038cd0
Add unliking to activitypub.
2017-04-14 18:09:30 +02:00
8c2aad1cab
Make new users follow themselves.
2017-04-14 17:29:27 +02:00
03ddaead7e
Add basic user caching.
...
Expires after 5 seconds.
2017-04-14 17:13:51 +02:00
90b38fd51b
Fix uploads and favorites in twidere / twittnuker.
2017-04-14 16:13:34 +02:00
18cd04ade5
Add user timeline
2017-04-14 16:09:13 +03:00
fa0c279139
Favorite changes.
...
- Add 'likes' to activity, collection of ids of people who liked it.
- show if you favorited something or not.
- Don't allow double favorites
- Address favorites to the followers of the liked activity's author.
2017-04-14 15:07:24 +02:00
5cb446a148
Add favoriting to TwAPI controller.
2017-04-13 17:22:44 +02:00
d0da40dc81
Display like activities.
2017-04-13 17:05:53 +02:00
653d605e14
Add favoriting to twitter api.
2017-04-13 16:19:07 +02:00
443381d0a0
Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into feature/user-timeline
2017-04-13 17:15:02 +03:00
1388054796
Add liking to ActivityPub.
2017-04-13 15:50:05 +02:00
f97c8e4379
Add utility functions for objects and activities.
2017-04-13 15:49:42 +02:00
1ccbe562c9
Add actor to objects.
2017-04-13 14:56:19 +02:00
a8e50d602b
Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into bugfix/repeated-follow-unfollow
2017-04-13 15:36:00 +03:00
594dd01ab2
Refactor follow API
2017-04-13 15:32:13 +03:00
3ff917b5dd
Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into feature/follow-by-screen-name
2017-04-13 15:18:18 +03:00
84c2012810
Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into feature/help-test
2017-04-13 15:15:09 +03:00
d2bf099ae6
Fix twitter api date.
2017-04-12 19:34:58 +02:00
f3e7771fd6
Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into develop
2017-04-12 17:47:56 +02:00
129e30f465
Add basic config endpoint.
2017-04-12 17:47:05 +02:00
bf22b1547c
Merge branch 'feature/home-timeline' into 'develop'
...
Add home timeline
See merge request !6
2017-04-12 11:30:46 -04:00
7469616f44
Merge branch 'bugfix/verify_credentials_get' into 'develop'
...
account/verify_credentials bugfix
See merge request !2
2017-04-12 11:29:35 -04:00
1b086834bd
Don't return html in the text field.
2017-04-12 17:22:29 +02:00
b666f11d2f
Add max_id fetching to activity fetching.
2017-04-12 17:12:00 +02:00
8eea09889b
Return directly addressed activities in friends timeline.
2017-04-12 16:45:23 +02:00
15655d992e
Fix user representation after following.
2017-04-12 16:38:55 +02:00
65ef18a715
Add error messages for repeated follows and unfollows
2017-04-12 17:34:36 +03:00
a7e74ee012
Add user timeline
2017-04-10 20:08:14 +03:00
6f99765fba
Add home timeline
2017-04-10 18:26:14 +03:00
c0e5b3459f
Add unfollowing using screen_name parameter
2017-04-10 16:45:47 +03:00
896e40cd2b
Add following using screen_name parameter
2017-04-10 16:38:21 +03:00
59a406d94c
Add test for help/test resource
2017-04-10 16:00:57 +03:00
9383c0aada
Add help/test resource
2017-04-10 15:54:53 +03:00
48b6ae2314
Add GET route for verify_credentials
2017-04-10 15:41:21 +03:00
0016589aea
Remove ambiguity in call to make_date/0
2017-04-10 15:22:49 +03:00
57795f7332
Refactor lib/pleroma/web/twitter_api/twitter_api.ex
2017-04-08 17:19:57 +03:00
8f43992121
Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into develop
2017-04-08 16:28:50 +03:00
567ec494c5
Add user registration mix task.
2017-04-05 12:27:25 +02:00
f45dc475c7
Fix replies.
2017-04-05 11:59:38 +02:00
b502d7981c
Add Follow Activity representer
2017-04-05 02:04:54 +03:00
8075badafe
Add Follow activity insertion
2017-04-04 03:30:07 +03:00
a83fa053de
Parse mentions, save them, output them in TwAPI.
2017-04-03 18:28:19 +02:00
ddaaab115e
Use standard base url in User.
2017-04-03 18:27:47 +02:00
2e89d505d3
Connect attachments with objects, not activities.
2017-03-30 18:07:38 +02:00
6aa1523bb3
Put objects in inserted activties into the db.
2017-03-30 18:07:29 +02:00
73df2f8e5e
Add attachments to the TwAPI.
2017-03-30 17:07:22 +02:00
42c90855ba
Basic ObjectRepresenter.
2017-03-30 16:08:49 +02:00
4a6d48b0fe
Return mimetype with attachment.
2017-03-30 16:08:23 +02:00
32aa83f3a2
Short circuit user verification if cookie is present.
2017-03-30 15:29:49 +02:00
d18473f0c3
Add port if specified.
2017-03-30 14:32:36 +02:00
e7dc39e40c
Basic file uploading via TwAPI.
2017-03-29 02:07:56 +02:00
08fdbd6f3a
Add Uploads.
2017-03-29 01:39:01 +02:00
d2cdcc097b
Add conversation fetching to TwAPI controller.
2017-03-28 17:22:44 +02:00
0dd3373304
Return statusnet_conversation_id in TwAPI.
2017-03-28 14:49:21 +02:00
e25aea3fa7
Add conversation id to activities.
...
This is for compatibility with the TwAPI.
2017-03-28 14:40:09 +02:00
e4de0ddc77
Add single status fetching to TwAPI.
2017-03-24 01:16:28 +01:00
866a2663d4
Add fetching of activities in context.
2017-03-24 00:09:08 +01:00
ae50b165cc
Add inReplyToStatus to TwAPI.
2017-03-24 00:00:06 +01:00
e56dba1563
Add context and inReplyTo.
2017-03-23 23:34:10 +01:00
74112ef99e
Add id to objects, too.
2017-03-23 21:22:49 +01:00
1f0f79d959
Generate ids for activities.
2017-03-23 17:56:49 +01:00
9ad045fd58
Return user specific json for logged in users.
2017-03-23 15:51:34 +01:00
30650e5bc6
Add unfollowing to TwAPI.
2017-03-23 13:13:09 +01:00
75e51b190d
Add following TwAPI endpoint.
2017-03-23 12:09:27 +01:00
e2e0cd75b7
Add friends timeline.
2017-03-22 17:25:59 +01:00
37e443ce6c
Add friends status fetching.
2017-03-22 16:51:20 +01:00
569d9bac17
Add fetching for recipients.
2017-03-22 14:45:17 +01:00
2db28df4cf
Add public timeline TwAPI.
2017-03-21 21:09:20 +01:00
b9d0e34506
Add since_id for activitypub fetching.
2017-03-21 20:31:48 +01:00
d4cf273f28
Add limiting to activity pub fetching.
2017-03-21 20:22:05 +01:00
ad303783af
Add status posting via TwAPI.
2017-03-21 18:17:35 +01:00
9a8850eb9e
Basic status creation and retrieval.
2017-03-21 17:53:20 +01:00
8de523c8ae
Basic AP objects.
2017-03-21 09:21:52 +01:00
093fd1832d
Add Twitter API verify_credentials endpoint.
2017-03-20 21:30:44 +01:00
980717fdce
Add Twitter API user representer.
2017-03-20 21:30:18 +01:00
142e8f8f3e
Don't use fetch access in plug.
...
This makes it work with structs.
2017-03-20 21:28:38 +01:00
66f536ecba
Add user schema.
2017-03-20 21:28:31 +01:00
e32dbfc9a5
Add basic auth.
2017-03-20 17:56:45 +01:00
a93f3421a7
Phoenix skeleton
2017-03-17 17:09:58 +01:00
4a6855d9ee
Provide plaintext representations of content/cw in MastoAPI
2017-01-01 03:10:08 +03:00
Ekaterina Vaartis
Mark Felder