Egor Kislitsyn
4944498133
Merge branch 'develop' into feature/compat/push-subscriptions
...
# Conflicts:
# lib/pleroma/application.ex
# lib/pleroma/plugs/oauth_plug.ex
2018-12-06 20:15:16 +07:00
Egor Kislitsyn
8b4397c704
Merge branch 'develop' into feature/compat/push-subscriptions
...
# Conflicts:
# lib/mix/tasks/sample_config.eex
# lib/pleroma/web/twitter_api/controllers/util_controller.ex
# mix.exs
# mix.lock
2018-12-06 19:55:58 +07:00
Egor Kislitsyn
04a48286e6
Add web push support
2018-12-06 19:29:04 +07:00
kaniini
ccf0b46dd6
Merge branch '210_twitter_api_uploads_alt_text' into 'develop'
...
[#210 ] TwitterAPI: alt text support for uploaded images. Mastodon API uploads security fix.
See merge request pleroma/pleroma!496
2018-12-06 07:36:21 +00:00
Ivan Tashkinov
3e90f688f1
[ #210 ] Mastodon: actor storing for media uploads, ownership check to update_media.
...
Refactoring.
2018-12-06 10:26:17 +03:00
lain
76d6b1c6ab
Merge remote-tracking branch 'origin' into follower-hiding
2018-12-05 21:27:56 +01:00
lain
fdac215091
TwitterAPI: Show users their own network.
2018-12-05 21:14:06 +01:00
lain
839526a913
TwitterAPI: Add network hiding.
2018-12-05 19:22:40 +01:00
Ivan Tashkinov
848151f7cb
[ #210 ] [TwitterAPI] Made actor be stored for uploads. Added ownership check
...
to `update_media` action. Added controller tests for `upload` and `update_media` actions.
Refactoring.
2018-12-05 13:37:06 +03:00
Ivan Tashkinov
be187f82f7
[ #210 ] Further refactoring.
2018-12-05 11:48:50 +03:00
Ivan Tashkinov
48e6193bf2
[ #210 ] Refactoring.
2018-12-04 19:24:41 +03:00
Ivan Tashkinov
826fc446d5
[ #210 ] TwitterAPI: implemented /api/media/metadata/create
...
to allow uploads description (alt text) setting.
2018-12-04 18:35:57 +03:00
William Pitcock
02288b5f1c
twitterapi: fix bad rebase
2018-12-04 04:52:09 +00:00
William Pitcock
e8570758f9
twitterapi: fix remaining test failures
2018-12-04 04:52:09 +00:00
William Pitcock
3b8e5bcbeb
fix most tests
2018-12-04 04:52:09 +00:00
William Pitcock
95a458f392
twitterapi: more object normalization work
2018-12-04 04:52:09 +00:00
Maxim Filippov
ce98d5eb9b
Parse user's bio on register
2018-12-02 22:03:53 +03:00
lain
8c9a4e8b40
TwitterAPI: Implement hide_network.
2018-12-02 18:14:13 +01:00
lain
93f2dc19d9
TwitterAPI: Fix banner and background update.
2018-12-01 12:01:22 +01:00
lain
c443c9bd72
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into validate-user-info
2018-12-01 09:55:46 +01:00
href
02d3dc6869
Uploads fun, part. 2
2018-11-30 18:02:37 +01:00
href
b19597f602
reverse proxy / uploads
2018-11-30 18:00:47 +01:00
lain
d0ec2812bd
Merge remote-tracking branch 'origin' into validate-user-info
2018-11-30 17:34:20 +01:00
lain
d407f662af
Fix TwitterApiController.
2018-11-30 17:07:37 +01:00
lain
a6812bc9df
Remove "most recent notification" endpoint.
2018-11-30 16:47:37 +01:00
href
bc5cf2c192
Improved version string
2018-11-20 17:55:03 +01:00
lain
fbb70d25fe
Several twitter api fixes.
2018-11-18 22:36:47 +01:00
lain
f87b315618
TwitterAPI: Fix dm_timeline displaying only half of the conversation.
2018-11-16 19:47:36 +01:00
lain
7b170cd616
Add Pleroma user search api for PleromaFE.
2018-11-14 20:33:23 +01:00
lain
ea9a776d7b
TwitterApi: Add direct message endpoint
2018-11-13 20:08:50 +01:00
scarlett
cb6fd73861
Twitter API: Fall back to user.nickname if user has no name
2018-11-12 15:52:13 +00:00
kaniini
4d627a5117
Merge branch 'feature/qvitter-notifications-dismiss' into 'develop'
...
qvitter notifications: add new "read notifications" API
See merge request pleroma/pleroma!431
2018-11-07 22:33:06 +00:00
kaniini
b451a92d78
Merge branch 'runtime-config' into 'develop'
...
Runtime configuration
See merge request pleroma/pleroma!430
2018-11-07 22:32:34 +00:00
William Pitcock
b2105a3131
twitterapi: add notification read endpoint
2018-11-06 23:25:07 +00:00
href
5bb88fd174
Runtime configuration
...
Related to #85
Everything should now be configured at runtime, with the exception of
the `Pleroma.HTML` scrubbers (the scrubbers used can be
changed at runtime, but their configuration is compile-time) because
it's building a module with a macro.
2018-11-06 19:41:15 +01:00
kaniini
0f3e78addb
Merge branch 'runtime-router' into 'develop'
...
Runtime configured router
See merge request pleroma/pleroma!426
2018-11-06 15:35:19 +00:00
href
013f7ba8c1
Add federating plug & public tests
2018-11-06 14:45:04 +01:00
href
6fe23c5458
Runtime configured router
2018-11-05 15:19:03 +01:00
href
763fc7b44f
Runtime configured emojis
...
The changes are a bit heavy since the emojis were loaded into module
attributes from filesystem.
This introduces a GenServer using an ETS table to cache in memory the
emojis, and allows a runtime-reload with `Pleroma.Emoji.reload()`.
2018-11-05 13:24:00 +01:00
Haelwenn (lanodan) Monnier
3c7d4ff271
Pleroma.Web.TwitterAPI.ActivityView: Harden TwitterAPI against remnant of prismo
2018-11-01 15:07:27 +01:00
William Pitcock
24ba08de13
twitter api: add support for rendering Page objects
2018-11-01 10:01:35 +00:00
William Pitcock
e12489e2fe
twitter api: enforce upload limits for avatars, banners and backgrounds
2018-10-29 16:43:05 +00:00
William Pitcock
5c6ec2d9fc
twitter/mastodon api: always use mediaproxy URLs in attachments
...
if using local media, the mediaproxy will not replace the URL anyway.
2018-10-29 15:19:32 +00:00
William Pitcock
26eb11c172
activitypub: add support for filtering broken threads out of timelines
2018-10-26 06:16:51 +00:00
William Pitcock
1ed25c963a
twitterapi: activity view: add the other in_reply_to fields
2018-10-25 04:04:04 +00:00
William Pitcock
fee43ae5e7
twitterapi: activity view: implement in_reply_to_screen_name using the new graph walking helper
2018-10-25 02:59:04 +00:00
scarlett
a253c1466e
New frontend options
2018-10-21 12:52:52 +01:00
scarlett
7562912f6a
Use maybe_direct_follow for follow imports
2018-10-17 04:16:11 +01:00
William Pitcock
7b3fff9af8
{mastodon api, twitter api}: make the follow handshake timeout configurable
2018-10-07 01:05:59 +00:00
William Pitcock
e69faf550c
user: add wait_and_refresh() for async three-way handshake case
2018-10-05 23:40:49 +00:00
William Pitcock
16307da311
twitterapi: frontend config: add formattingOptionsEnabled
2018-10-05 20:49:34 +00:00
William Pitcock
b1be9415ef
Revert "Merge branch 'revert-a26d5e6b' into 'develop'"
...
This reverts commit d31bbb1cfe340ab3cb90
2018-10-05 20:49:34 +00:00
Haelwenn (lanodan) Monnier
82b57ebad1
[Pleroma.Web.TwitterAPI.UserView]: Add mastodon-fields in "fields"
2018-09-28 10:44:45 +02:00
William Pitcock
56577d8b48
twitter api: add no_rich_text option to userview for account prefs
2018-09-22 03:24:40 +00:00
William Pitcock
c2b69798dd
twitter api: add support for disabling rich text
2018-09-22 02:53:02 +00:00
William Pitcock
2f5b026548
twitter api: add support for user-specified html policy
2018-09-22 02:53:01 +00:00
William Pitcock
c9585ec007
twitter api: fix mimetype fallback when attachments use a URI instead of a URL object
2018-09-19 04:59:26 +00:00
William Pitcock
e82ce2a4b3
formatting
2018-09-10 00:28:40 +00:00
William Pitcock
ac486fc59b
everywhere: use Pleroma.HTML module instead of HtmlSanitizeEx directly
2018-09-10 00:14:47 +00:00
kaniini
b7923aa304
Merge branch 'hotfix_broken_likes' into 'develop'
...
hotfix for broken like completely breaking the notifications API
See merge request pleroma/pleroma!284
2018-09-02 12:37:00 +00:00
William Pitcock
e2ce0e9e05
run mix format.
2018-09-01 21:12:42 +00:00
William Pitcock
c921d99898
config: add ability to disable Pleroma FE config management ( closes #276 )
2018-09-01 21:05:32 +00:00
lambda
58539e1357
Revert "Merge branch 'feature/rich-text' into 'develop'"
...
This reverts merge request !309
2018-08-31 09:51:20 +00:00
William Pitcock
856b5e1ca4
config: chase pleroma-fe updates from MR pleroma-fe!324.
2018-08-31 04:01:21 +00:00
William Pitcock
6aa65b68b8
common api: add support for formatting messages outside of twitter-style plain text
2018-08-31 03:13:59 +00:00
Henry Jameson
0f1c629d65
better solution, added test.
2018-08-27 17:07:26 +03:00
hakabahitoyo
946a0769c4
remove unused settings from /api/statusnet/config
2018-08-26 17:40:15 +09:00
William Pitcock
aab2bdddf4
twitter api: provide object descriptions as attachment description field
2018-08-25 00:12:58 +00:00
William Pitcock
09cb402203
fe config: add collapse_message_with_subject fe option
2018-08-24 18:21:42 +00:00
Henry Jameson
9b046d2a84
fixed notifications API completely breaking if there's a like for
...
missing (deleted) post.
2018-08-22 16:10:59 +03:00
Haelwenn (lanodan) Monnier
643f373514
Run mix format
2018-08-22 12:09:01 +02:00
Haelwenn (lanodan) Monnier
d5bdd55b5d
[Pleroma.Web.TwitterAPI.UserView]: Do not fail if user.bio is nil
2018-08-22 01:47:25 +02:00
kaniini
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
Haelwenn (lanodan) Monnier
74c74decf5
Basic peertube support.
2018-08-21 18:24:09 +02:00
ensra
cdb3dd48ab
Format
2018-08-21 14:12:55 +01:00
ensra
5debd7b5cc
Twitter API: Support Mastodon-style bios
...
(multi-line, with links, and user mentions)
2018-08-21 14:03:36 +01:00
lain
8c0c930041
formatting
2018-08-12 19:42:21 +02:00
lain
ffd9ad1f0c
Fix for elixir 1.7.
2018-08-12 18:41:33 +02:00
lambda
13440a80e1
Merge branch 'feature/invites' into 'develop'
...
Invites
Closes #108
See merge request pleroma/pleroma!208
2018-08-12 12:04:15 +00:00
lambda
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
eal
db5cdfa333
Remote follow: don't show confusing error if already following
2018-08-09 20:47:29 +03:00
eal
37b802682c
HTML-sanitize usernames before emojifying.
2018-08-09 13:07:03 +03:00
eal
ed9738e031
Add tests for emoji in user profiles
...
Also use the correct field in TwitterAPI...
2018-08-08 09:24:50 +03:00
eal
cee63ad3f7
TwitterAPI user view: add screen_name_html and description_html.
2018-08-08 08:38:25 +03:00
William Pitcock
b23630076f
TwitterAPI: present pleroma frontend config in API
2018-07-17 15:46:24 +00:00
William Pitcock
b832df1e15
formatting
2018-07-12 16:12:54 +00:00
William Pitcock
f03e57f764
twitter api: activity representer: add summary field for testsuite
2018-07-12 16:12:16 +00:00
William Pitcock
152a526237
twitter api: refactor activity html generation, add support for Articles
2018-07-12 16:11:42 +00:00
William Pitcock
3b799f22b7
twitterapi: activity view: expose message summary text
2018-07-12 16:11:36 +00:00
lambda
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
William Pitcock
971bb4f2bd
activity interpretation: formatting
2018-06-27 13:38:19 +00:00
William Pitcock
66819ea784
twitter api: use ActivityView.render_content() where appropriate instead of duplicating the logic
2018-06-27 13:38:07 +00:00
William Pitcock
121c1f6230
twitter api: refactor activity html generation, add support for Articles
2018-06-27 13:37:53 +00:00
William Pitcock
2f14996d9a
twitter api: allow setting default_scope
2018-06-27 13:15:55 +00:00
William Pitcock
dcdf7b6686
twitter api: user view: show default message scope if known
2018-06-27 13:15:50 +00:00
Vivian Lim
1299bccc7d
return unquoted empty array from /api/qvitter/mutes.json
2018-06-23 23:20:30 -07:00
lambda
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
Francis Dinh
1555c66650
Add unretweet TwAPI endpoint and cleanup AP.unannounce
2018-06-13 21:33:36 -04:00
Henry Jameson
9c1cf1befb
formatting
2018-06-12 15:01:40 +03:00
Henry Jameson
f42ffbe9a8
Initial invites support + tests.
2018-06-12 14:55:16 +03:00
William Pitcock
f8e0942745
twitter api: add approve/deny endpoints
2018-06-11 22:15:53 +00:00
William Pitcock
e08cf21e5b
twitter api: add friend requests list api
2018-06-11 22:15:53 +00:00
William Pitcock
ba8dab7542
twitterapi: user view: return if an account is locked or not
2018-06-11 22:15:53 +00:00
William Pitcock
993312cdb3
twitterapi: add profile setting for locked/unlocked accounts
2018-06-11 22:15:53 +00:00
Rachel H
1525a0404b
Fix follow errors
2018-06-07 00:39:24 -07:00
lain
0f70e83e8c
Better error handling in TwitterApiController.
2018-06-03 19:11:22 +02:00
eal
935e544e19
TwitterAPI: fix "Follows you" being shown for the wrong user.
2018-05-31 15:27:42 +03:00
lain
3ece4a3ebc
Only return certain activities in TwitterAPI mentions.
2018-05-28 12:38:48 +02:00
William Pitcock
e80d91c64a
introduce User.maybe_direct_follow() and use it where we used to call User.follow()
2018-05-25 09:40:10 +00:00
William Pitcock
c89b90222c
twitter api: also remove explicit User.follow here
2018-05-25 09:40:06 +00:00
lambda
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
Francis Dinh
72b93d13f8
Hook up block/unblock to TwitterAPI
2018-05-22 05:41:17 -04:00
Francis Dinh
55f9aefd08
Hook unfollow into TwitterAPI
2018-05-22 04:49:30 -04:00
Syldexia
d0690622cd
Added endpoint for changing passwords
2018-05-21 23:06:03 +01:00
Francis Dinh
89c5de9096
Fix unfollows
2018-05-20 21:01:14 -04:00
lain
dca26f3655
Fix specs.
2018-05-20 19:22:26 +02:00
lain
ff007af0c2
Return visilility in twitter api, too.
2018-05-20 18:01:24 +02:00
lain
434601a5c3
Return private / direct posts on user timelines, too.
2018-05-20 16:15:18 +02:00
lambda
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
Thog
6f39ecc41b
Support Undo like activities ( Fix #139 )
2018-05-19 22:14:15 +02:00
Syldexia
d1366f8d46
Modified deleting an account to run as a task
2018-05-19 13:35:49 +01:00
Syldexia
5bfb7b4ce6
Moved account deletion stuff to somewhere that hopefully makes more sense
2018-05-13 14:36:02 +01:00
Syldexia
a16117225f
Added endpoint for user account deletion
2018-05-13 14:35:48 +01:00
lambda
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
aaacebd906
Fix unused variables, imports, and aliases
2018-05-04 21:42:20 +00:00
636f0fa402
Clean up unused aliases and imports
2018-05-04 21:25:31 +00:00
943820ae29
More unused variables
2018-05-04 21:16:02 +00:00
ab4aa5720a
Fix a bunch of unused variable warnings
2018-05-04 20:59:01 +00:00
lain
bc215f5684
Fix format.
2018-04-29 11:28:26 +02:00
Francis Dinh
0df1a4efc8
Fix comment grammar
2018-04-25 00:46:06 -04:00
Wim Vanderbauwhede
7517155544
Changed to support \r\n and \n
2018-04-24 13:28:55 +01:00
Wim Vanderbauwhede
52ee91efce
Patch to replace newlines with <br> tags in bio
2018-04-24 13:20:17 +01:00
Francis Dinh
c5dc7e6e31
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into feature/unrepeats
2018-04-20 16:48:18 -04:00
lain
a61e8ac154
Formatting.
2018-04-20 13:10:57 +02:00
eal
fa37acfcc7
TwitterAPI: Add Qvitter notification endpoint.
2018-04-19 21:46:59 +03:00
Francis Dinh
32a26eb910
Fix TwitterAPI.delete call
2018-04-18 20:43:03 -04:00
Francis Dinh
7b4f55238e
Handle unrepeats via the TwitterAPI
2018-04-18 06:00:40 -04:00
Francis Dinh
85bd191291
Remove unretweet function for now
2018-04-17 04:12:16 -04:00
Francis Dinh
b949577472
Add unrepeat functionality
2018-04-14 20:19:48 -04:00
lain
8f9bcc4ab0
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop
2018-04-07 16:41:47 +02:00
lain
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
eal
e7ddda44c0
Follow import: allow URI in addition to screen_name.
2018-04-07 15:00:23 +03:00
lain
d70d1c427a
TwitterAPI: Don't put follows into the public tls.
2018-04-04 15:23:27 +02:00
lain
b3b7ab5d9a
Load all users at once in timelines.
2018-04-02 16:35:41 +02:00
lain
360c51f1f5
Use context_ids directly if we have them.
2018-04-02 15:28:35 +02:00
lain
bc31bee7c4
Generates contexts and ids on insertion time.
2018-04-02 15:17:09 +02:00
lain
a4db3a732f
Pre-fetch conversation ids.
2018-04-02 14:46:56 +02:00
lain
802736679c
Remove unused ActivityRepresenter module.
2018-03-30 16:50:30 +02:00
lain
7ab94ae22d
TwitterApiController: Use ActivityView.
2018-03-30 16:30:16 +02:00
lain
e90f8f6c4b
TwApi ActivityView: Add delete activities.
2018-03-30 15:32:43 +02:00
lain
1f32ba052c
TwApi ActivityView: Add follows.
2018-03-30 15:17:13 +02:00
lain
4afbef39f4
Format the code.
2018-03-30 15:01:53 +02:00
lain
c1d529ee94
TwApi ActivityView: Add announces.
2018-03-30 14:46:36 +02:00
lain
1f1caab138
TwApi ActivityView: Add Like rendering.
2018-03-30 13:49:09 +02:00
lain
df8fc72491
Don't go through all available emoji.
...
object carry their emoji information.
2018-03-28 09:56:32 +02:00
lain
e30752bc79
Add basic activity view.
2018-03-27 22:24:19 +02:00
lain
d2099c849d
More Jason changes.
2018-03-27 16:45:38 +02:00
lain
847cb15626
Fix tests.
2018-03-24 15:09:09 +01:00
lain
c7be7a9454
Unify user fetching.
2018-03-24 15:02:43 +01:00
lain
a17ba0ee0d
Only return posts in TwAPI user view.
2018-02-26 09:02:14 +01:00
lain
e9de04b74b
Add support for outgoing update.
2018-02-25 21:08:32 +01:00
lain
4ea2a41014
Fix more specs.
2018-02-25 17:48:31 +01:00
lain
dfaddeb765
Use update_and_set cache.
2018-02-25 16:34:24 +01:00
lain
7e0ce32f4d
Fix external url in twitterapi.
2018-02-24 20:29:57 +01:00
lain
94db9ac4db
Merge branch 'develop' into feature/activitypub
2018-02-21 18:34:19 +01:00
lain
947ba6495d
More TwAPI fixes.
2018-02-21 10:31:13 +01:00
lain
391b3e3586
TwitterAPI: Fix some bugz.
2018-02-21 08:16:04 +01:00
lain
fd95075e32
TwitterAPI: Fix mentions.
2018-02-20 19:50:34 +01:00
lain
5bc810c452
Add moderator function.
2018-02-20 18:44:50 +01:00
lain
01faa7c555
TwitterAPI: support follow activities without published date.
2018-02-19 09:50:57 +01:00
lain
1633470e4a
TwitterAPI: Only fetch creates, announces, follows.
2018-02-19 09:50:41 +01:00
lain
010f818a29
Fix conversations.
2018-02-18 20:52:07 +01:00
lain
5d89997a70
Respect visibility in API.
2018-02-18 15:50:34 +01:00
lain
c974f6544f
Show users their own posts in timeline.
2018-02-18 15:20:36 +01:00
lain
539340d914
Handle sensitive property.
2018-02-18 14:14:16 +01:00
lain
ce31f3a922
Twitter Representers: Handle Mastodon attachments.
2018-02-11 17:21:06 +01:00
Roger Braun
08f458e6df
UtilController: Fix statusnet config api compatibility.
2018-02-09 13:43:12 +01:00
eal
29be70c008
Add remote following of local profiles.
2018-02-02 00:14:05 +02:00
eal
ab83e0de6d
TwitterAPI: Add is_local to user view.
2018-02-01 21:41:19 +02:00
eal
beb13bf3a9
Revert "Revert "Add remote follow pages.""
...
This reverts commit b259b4e4d1
2018-01-18 18:42:44 +02:00
eal
b259b4e4d1
Revert "Add remote follow pages."
...
This reverts commit 47e8c8db05
2018-01-18 03:42:18 +02:00
eal
47e8c8db05
Add remote follow pages.
2018-01-18 03:11:03 +02:00
eal
b3e7d7ae6d
Fetch external profile in the background.
2018-01-16 15:31:03 +02:00
eal
14b086eec2
Add a default profile picture and banner.
...
This removes the placehold.it dependency.
2018-01-15 22:18:17 +02:00
eal
5c09d8d3f1
Unlink follow import process from the one processing request.
...
Mistakes were made.
2017-12-23 16:40:43 +02:00
lambda
35ac549a99
Merge branch 'media-proxy' into 'develop'
...
Media proxy
See merge request pleroma/pleroma!34
2017-12-20 14:22:24 +00:00
lambda
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
eal
1969773fb4
Fix follower/following lists.
...
Add tests.
2017-12-18 16:37:26 +02:00
eal
fdfb508259
Run follow import in the background.
2017-12-12 21:04:41 +02:00
eal
d89193a8d7
Allow uploading a file for follow import.
2017-12-12 21:03:28 +02:00
eal
39ccfdc084
Add follow import.
2017-12-12 18:35:23 +02:00
href
72f7baa654
Merge remote-tracking branch 'upstream/develop' into media-proxy
2017-12-05 14:12:15 +01:00
Lain Iwakura
5c40986120
Basic backend chat.
2017-12-04 19:10:15 +01:00
href
5f35fdcf5d
media proxy: good enough wip
2017-11-28 20:50:34 +01:00
Thog
59770c3f5c
Fix all compilation warnings
2017-11-19 02:22:07 +01:00
eal
31e4277ba5
Don't add summary if empty.
2017-11-18 15:25:22 +02:00
lambda
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
eal
f9828e578c
TwitterAPI: Add /users/show.
2017-11-14 17:34:48 +02:00
eal
22bbe27115
TwitterAPI: Add unimplemented /friendships/no_retweets/ids.
2017-11-14 16:10:13 +02:00
eal
3533bf7eac
TwitterAPI: Add /friends/ids.
2017-11-14 16:04:58 +02:00
lambda
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
eal
f7fc048aeb
TwitterAPI user view: add follows_you.
2017-11-08 19:13:03 +02:00
Roger Braun
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
eal
4656cb9b99
TwitterAPI user view: add blocks.
2017-11-08 13:02:00 +02:00
eal
6c0758e041
TwitterAPI: Add blocks.
2017-11-08 00:04:53 +02:00
eal
c6210183e1
Add mastodon API endpoint for custom emoji.
2017-11-07 21:55:01 +02:00
Roger Braun
d89a7a0b34
TwitterAPI: Add blocking to fetches.
2017-11-02 22:50:42 +01:00
Roger Braun
04217f52c9
TwitterAPI: Display cws.
2017-10-31 17:43:37 +01:00
eal
fe7804e42d
Add an API endpoint for emoji.
2017-10-19 22:51:56 +03:00
Roger Braun
6af164f27b
Add password reset.
2017-10-19 17:37:24 +02:00
Roger Braun
d009a79df5
TwitterAPI: Return proper error.
...
Fixes #32 .
2017-09-17 14:37:00 +02:00
Roger Braun
6877d7aaad
Fix typo.
2017-09-17 12:08:50 +02:00
Roger Braun
b7b3e3f263
Use inserted_at as sort in search.
2017-09-17 11:32:24 +02:00
Roger Braun
959e993c7d
Apply incoming custom emoji.
2017-09-16 16:40:20 +02:00
Roger Braun
884006a9e9
Federate emoji out.
2017-09-16 16:14:23 +02:00
Roger Braun
c17c8ce36d
Don't check limit twice in TwitterAPIController.
2017-09-16 15:47:07 +02:00
Roger Braun
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
Roger Braun
f039c9c19a
Don't specify order in results for now.
2017-09-16 14:40:53 +02:00
Roger Braun
5d1f8dcd1c
TwitterAPI: Add search.
2017-09-16 14:33:47 +02:00
Roger Braun
c20530e708
Add configuration option for registrations.
2017-09-15 14:39:32 +02:00
Roger Braun
50409326a8
Refactor posting and make character limit configurable.
2017-09-15 14:17:36 +02:00
Roger Braun
d625d8db7d
Add unfav to Mastodon API.
2017-09-09 18:30:02 +02:00
Roger Braun
454dc18570
Add favoriting to Mastodon API.
2017-09-09 18:09:37 +02:00
Roger Braun
66e4c710d4
Add reblogging to MastodonAPI.
2017-09-09 17:48:57 +02:00
Roger Braun
4dc517a0bb
Add deletion to masto api.
2017-09-09 13:56:51 +02:00
Roger Braun
2652d9e4ed
Slight cleanup.
2017-09-07 08:58:10 +02:00
Roger Braun
632e1f7943
Add delete to TwAPI representer correctly.
2017-09-04 20:48:29 +02:00
Roger Braun
1f9a5272e1
Add delete to TwAPI.
2017-09-04 20:48:14 +02:00
Roger Braun
fcf3128a56
Add TwAPI representer for deletes.
2017-09-04 20:03:28 +02:00
Roger Braun
6c3a0ffae4
Add banner and background updating.
2017-08-29 17:18:33 +02:00
Roger Braun
5142a8efbb
Add profile update.
2017-08-29 15:14:00 +02:00
Roger Braun
171ef33cbb
More sensible attachment names.
2017-08-28 19:17:38 +02:00
Roger Braun
67bfa19b35
Set twitter-style possibly_sensitive boolena.
2017-08-24 16:27:37 +02:00
Roger Braun
5dc278b1a6
Add activity_type to twitter api output.
2017-08-24 16:18:26 +02:00
Roger Braun
d95b78c72f
Remove email from mastoinfo.
2017-08-24 14:19:54 +02:00
Roger Braun
d1f86ad69f
Basic masto-style info.
2017-08-24 14:15:16 +02:00
Roger Braun
8a97bebc53
More meta info fixes.
2017-08-24 14:07:05 +02:00
Roger Braun
7ccdebe180
Small meta info fixes.
2017-08-24 13:36:28 +02:00
Roger Braun
1a001588e8
Don't break on empty mentions.
2017-08-24 12:54:01 +02:00
Roger Braun
7d34cec58d
escape attachment urls on creation.
2017-08-09 16:55:18 +02:00
Roger Braun
00b722430f
Revert "Close br tags."
...
This reverts commit 2eba8e74cc
2017-07-31 13:27:38 +02:00
Roger Braun
19e8421947
Revert "Wrap in <p>."
...
This reverts commit c81d0b6f89
2017-07-31 13:27:29 +02:00
Roger Braun
3063e3b440
Revert "Remove newlines completely so mastodon doesn't bug out."
...
This reverts commit 0ca3ab7b59
2017-07-31 13:27:19 +02:00
Roger Braun
0ca3ab7b59
Remove newlines completely so mastodon doesn't bug out.
2017-07-31 13:06:31 +02:00
Roger Braun
c81d0b6f89
Wrap in <p>.
2017-07-31 12:16:44 +02:00
Roger Braun
2eba8e74cc
Close br tags.
2017-07-31 10:46:29 +02:00
Roger Braun
72ca58c540
Save follower count and note count in user.
2017-07-22 17:42:15 +02:00
Roger Braun
a027b0027c
Add friends endpoint.
2017-07-20 20:35:30 +02:00
Roger Braun
94a394e3a8
Add followers endpoint.
2017-07-20 20:29:15 +02:00
Roger Braun
140f72725d
Use follower address in user entry.
2017-07-19 19:06:49 +02:00
Roger Braun
7e9647b146
Fix undo activity.
2017-07-08 11:17:35 +02:00
Roger Braun
e343c0c9c4
Add way to update most recent notification id.
2017-07-02 15:01:59 +02:00
Roger Braun
9bdea19d83
For non-create activities, grab the create activity to fav/rt
2017-06-30 16:59:54 +02:00
Roger Braun
cd522d2139
Also fetch posts by id in fav/rts.
2017-06-30 16:53:25 +02:00
Roger Braun
1c074efeaf
Add external links to twapi.
2017-06-25 12:07:08 +02:00
dtluna
08e53df91e
Move util functions to UtilController
2017-06-20 17:55:57 +03:00
Roger Braun
1e6491ec96
Merge branch 'develop' into refactor/user-view
2017-06-20 11:49:41 +02:00
Roger Braun
af49c11193
Work around upserting problems in context mapping.
2017-06-20 09:50:22 +02:00
dtluna
069daf644d
Replace UserRepresenter with UserView
2017-06-20 00:12:37 +03:00
Roger Braun
45c751985e
Move finmojis to representation.
2017-06-19 18:06:58 +02:00
Roger Braun
66b4fee80e
Add finmoji.
2017-06-19 17:51:43 +02:00
Roger Braun
fa82822932
Revert "Add invisible tags to TwAPI output."
...
This reverts commit a92a9dce94
2017-06-18 18:59:13 +02:00
Roger Braun
d00571ff75
Fetch user feed on externalprofile request.
...
This is so we always have something to show.
2017-06-18 17:20:39 +02:00
Roger Braun
fafb765c48
Output tags list in TwAPI.
2017-06-18 14:43:44 +02:00
Roger Braun
8feec8d390
Strip unsafe html on output in TwAPI.
2017-06-18 13:40:35 +02:00
Roger Braun
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
Roger Braun
83c657afa5
Do some basic escaping.
2017-06-14 14:46:18 +02:00
Roger Braun
1af9c77736
Move mention parsing to Formatter module.
2017-06-14 13:58:56 +02:00
Roger Braun
eb18b9ebba
Enable user timelines.
2017-06-12 17:12:55 +02:00
Roger Braun
00c032783d
Fix NaN statuses per day.
2017-06-05 15:47:37 +02:00
Roger Braun
c7fdd1b7ff
Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into develop
2017-06-01 11:24:03 +02:00
Roger Braun
c6aa60c829
Shorten names in links.
2017-05-30 14:26:31 +02:00
Roger Braun
4854a604ef
Extract note handler.
2017-05-20 13:41:33 +02:00
Roger Braun
48f9df2391
Keep newlines around.
2017-05-18 16:41:16 +02:00
Roger Braun
a92a9dce94
Add invisible tags to TwAPI output.
2017-05-18 16:24:41 +02:00
Roger Braun
0da6ade619
Save tags in object.
2017-05-18 15:16:49 +02:00
Roger Braun
9033bfffd2
Twitter API refactoring.
2017-05-17 18:00:20 +02:00
Roger Braun
70024632ba
AP refactoring.
2017-05-16 18:19:04 +02:00
Roger Braun
423194520e
Fix mention replacing.
2017-05-15 18:25:21 +02:00
Roger Braun
04544da8f1
Fetch user on externalprofile if we don't know him
2017-05-12 18:50:47 +02:00
Roger Braun
36448d6483
Add externalprofile to TwAPI.
2017-05-10 18:44:57 +02:00
Roger Braun
71362acb93
Quick fix for database filling.
2017-05-09 00:20:05 +02:00
Roger Braun
1418d72749
Add class=attachment to attachment links.
2017-05-08 20:12:36 +02:00
Roger Braun
b9da7d3219
typo.
2017-05-07 20:30:34 +02:00
Roger Braun
7303786160
Add some twapi fixes.
2017-05-07 20:20:53 +02:00
Roger Braun
b403ea4d2b
Merge branch 'develop' into dtluna/pleroma-feature/unfollow-activity
2017-05-07 19:28:23 +02:00
Roger Braun
a41aa4e489
Federate follow salmons.
2017-05-07 14:45:37 +02:00
Roger Braun
95ab0dc3c5
Add conversation ids to twapi announce representer.
2017-05-07 12:46:21 +02:00
Roger Braun
7269c51f3a
Some refactoring.
2017-05-05 12:07:38 +02:00
Roger Braun
c48c381e90
Merge branch 'develop' into dtluna/pleroma-refactor/1
2017-05-05 11:46:59 +02:00
Roger Braun
33c803d6da
Add attachment link to posts.
2017-05-02 18:25:39 +02:00
Roger Braun
16f8406eb6
Add statusnet_profile_url to the TwAPI.
2017-05-02 14:36:04 +02:00
Roger Braun
32a95d73da
Add twkn timeline.
2017-05-02 14:12:43 +02:00
Roger Braun
3cb518270a
Remove superfluous transaction.
2017-05-01 16:15:21 +02:00
Roger Braun
f169de3454
Cache objects in dev and prod.
2017-05-01 16:12:20 +02:00
Roger Braun
09f7ed4214
Don't set statusnetConversationIds on replies anymore.
2017-04-30 14:26:29 +02:00
Roger Braun
379caca01d
Wrap context creation in transaction.
2017-04-30 13:58:40 +02:00
Roger Braun
4c8111c334
Use conversation mapping objects to get / retrieve context from TwAPI.
2017-04-30 13:53:26 +02:00
Roger Braun
ffc604a2c2
Use cache for user info data.
...
Later these should be persisted in the user.
2017-04-30 10:04:54 +02:00
dtluna
a9b2ad1759
Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into feature/unfollow-activity
2017-04-28 16:06:57 +03:00
dtluna
6cf7c13228
Refactor code to comply with credo suggestions
2017-04-27 16:18:50 +03:00
Roger Braun
e8882ab3da
Merge branch 'develop' into feature/incoming_ostatus
2017-04-26 09:18:49 +02:00
dtluna
c3655d1c47
Remove unnecessary status_update definition
2017-04-25 19:47:16 +03:00
Roger Braun
b438ea24ee
Add ostatus conversation as context.
2017-04-25 17:45:34 +02:00
Roger Braun
6c5f5e18ec
Even more refactoring.
2017-04-25 17:36:53 +02:00
Roger Braun
4771962a5d
More refactoring.
2017-04-25 17:32:36 +02:00
Roger Braun
ef4190b3ab
Clean up status create method.
2017-04-25 17:26:05 +02:00
Roger Braun
ab0114fbaa
Return salmon path for users, basic incoming salmon handling.
2017-04-24 18:46:34 +02:00
dtluna
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
dtluna
5b6070ec40
Deny whitespace statuses
2017-04-24 12:09:11 +03:00
dtluna
f723b23691
Add error response to self-repeats
2017-04-24 01:11:38 +03:00
dtluna
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
dtluna
1e3791877c
Add error response on empty status
2017-04-23 19:08:25 +03:00
lambadalambda
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
Roger Braun
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
dtluna
28b203d08f
Add Undo of Follow Activity insertion
2017-04-21 19:54:21 +03:00
Roger Braun
1c00eb4a90
Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into ostatus
2017-04-21 18:42:28 +02:00
dtluna
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
Roger Braun
9afc672009
Quick fix for activities without 'to'.
2017-04-21 01:01:58 +02:00
Roger Braun
1e88f102c4
Fix specs, add some user info.
2017-04-21 00:51:09 +02:00
dtluna
3a56d7318f
Add statuses/mentions endpoint
2017-04-20 15:18:54 +03:00
dtluna
b248fc7dfb
Refactor unfollow/2
2017-04-20 10:57:37 +03:00
dtluna
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
dtluna
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
lambadalambda
eda742c78b
Merge branch 'feature/user-timeline' into 'develop'
...
Feature/user timeline
See merge request !8
2017-04-19 05:50:24 -04:00
Roger Braun
36e883cd4b
Add basic Ostatus user representer.
2017-04-17 14:12:36 +02:00
lambadalambda
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
dtluna
ef5033d7a7
Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into bugfix/repeated-follow-unfollow
2017-04-16 17:18:34 +03:00
dtluna
f6547f7b7f
Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into feature/unfollow-by-screen-name
2017-04-16 17:13:42 +03:00
dtluna
82914e1e4d
Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into feature/follow-by-screen-name
2017-04-16 17:12:28 +03:00
dtluna
85bd480be3
Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into feature/help-test
2017-04-16 17:10:25 +03:00
dtluna
5229b01944
Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into feature/user-timeline
2017-04-16 17:08:17 +03:00
Roger Braun
eb9358c8d6
Add basic Avatar updating code.
2017-04-16 16:06:19 +02:00
dtluna
63f04b314d
Fix typo
2017-04-16 17:05:48 +03:00
dtluna
4b4ece2c74
Add user timeline fetching without credentials
2017-04-16 16:44:30 +03:00
Roger Braun
03a9c11d25
Display the users avatar if he has one set.
2017-04-16 15:40:50 +02:00
dtluna
7a0046d127
Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into feature/user-timeline
2017-04-16 13:32:56 +03:00
dtluna
9a8c348aed
Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into feature/unfollow-by-screen-name
2017-04-16 13:28:23 +03:00
dtluna
ce1eef9c98
Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into feature/help-test
2017-04-16 13:25:38 +03:00
Roger Braun
b41f3eff84
Preserve newlines in messages.
2017-04-16 11:51:00 +02:00
Roger Braun
5dac3727f1
Add registration to the TwAPI controller.
2017-04-16 11:01:24 +02:00
Roger Braun
b1edd94baa
Add user registration to TwAPI.
2017-04-16 10:25:27 +02:00
Roger Braun
4799dc6991
Add retweeting to TwAPI controller.
2017-04-15 14:09:54 +02:00
Roger Braun
60c60de330
Add announcements / retweets to TwAPI.
2017-04-15 13:54:46 +02:00
Roger Braun
7a47afed3c
Update object correctly after setting context.
2017-04-14 18:59:11 +02:00
Roger Braun
c83f279a7d
Add unliking to TwAPI controller.
2017-04-14 18:27:17 +02:00
Roger Braun
f4eea0847b
Add unfavoriting to TwAPI.
2017-04-14 18:15:15 +02:00
Roger Braun
03ddaead7e
Add basic user caching.
...
Expires after 5 seconds.
2017-04-14 17:13:51 +02:00
Roger Braun
90b38fd51b
Fix uploads and favorites in twidere / twittnuker.
2017-04-14 16:13:34 +02:00
dtluna
18cd04ade5
Add user timeline
2017-04-14 16:09:13 +03:00
