nullobsi/akkoma
1
0
Fork 0
forked from AkkomaGang/akkoma
Code Issues Pull requests Projects Releases Packages Wiki Activity
4834 commits 5 branches 71 tags 293 MiB
Commit graph

1277 commits

Author SHA1 Message Date
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
f51a672ac4 Return object id in Ostatus create activties. 2017-04-21 04:22:02 +02:00
Roger Braun
424e0e7779 Add Websub verification. 2017-04-21 03:59:11 +02:00
Roger Braun
1e88f102c4 Fix specs, add some user info. 2017-04-21 00:51:09 +02:00
Roger Braun
1b9cc721a0 Websub controller beginnings. 2017-04-20 17:47:33 +02:00
dtluna
3a56d7318f Add statuses/mentions endpoint 2017-04-20 15:18:54 +03:00
Roger Braun
cc330421fd Better activities in ostatus. 2017-04-20 10:16:06 +02: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
d23f3e3cf3 Add webfinger and basic feed support. 2017-04-18 18:41:51 +02:00
dtluna
470f5f7cd6 Add user timeline spec test 2017-04-17 16:31:19 +03:00
Roger Braun
36e883cd4b Add basic Ostatus user representer. 2017-04-17 14:12:36 +02:00
Roger Braun
ce6cc84a4a Add basic webfinger. 2017-04-17 13:44:41 +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
Roger Braun
6a0e69a8a3 Fix syntax error. 2017-04-17 11:43:44 +02:00
Roger Braun
a185ea63af Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into develop 2017-04-17 11:37:21 +02:00
Roger Braun
6bfd521974 Switch cache implementation for size limiting. 2017-04-17 11:36:17 +02:00
dtluna
369be708b2 Remove unnecesary queries 2017-04-16 17:42:15 +03:00
dtluna
f6e632d25b Remove unnecesary asserts 2017-04-16 17:39:34 +03: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
Roger Braun
d7e3b72c6a Add avatar objects to user, fix specs. 2017-04-16 15:28:28 +02:00
Roger Braun
7617a593b9 Support data uris in uploads. 2017-04-16 14:23:30 +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
4f7adb343c Address liking / announcing to the original author. 2017-04-15 14:16:01 +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
21c397820f Add announcements to activitypub. 2017-04-15 12:11:20 +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
a926038cd0 Add unliking to activitypub. 2017-04-14 18:09:30 +02:00
Roger Braun
03ddaead7e Add basic user caching. 
Expires after 5 seconds.
 2017-04-14 17:13:51 +02:00
dtluna
18cd04ade5 Add user timeline 2017-04-14 16:09:13 +03:00
Roger Braun
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
Roger Braun
5cb446a148 Add favoriting to TwAPI controller. 2017-04-13 17:22:44 +02:00
Roger Braun
d0da40dc81 Display like activities. 2017-04-13 17:05:53 +02:00
Roger Braun
653d605e14 Add favoriting to twitter api. 2017-04-13 16:19:07 +02:00
Roger Braun
1388054796 Add liking to ActivityPub. 2017-04-13 15:50:05 +02:00
Roger Braun
1ccbe562c9 Add actor to objects. 2017-04-13 14:56:19 +02:00
dtluna
a8e50d602b Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into bugfix/repeated-follow-unfollow 2017-04-13 15:36:00 +03:00
dtluna
3ff917b5dd Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into feature/follow-by-screen-name 2017-04-13 15:18:18 +03:00
dtluna
84c2012810 Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into feature/help-test 2017-04-13 15:15:09 +03:00
Roger Braun
d2bf099ae6 Fix twitter api date. 2017-04-12 19:34:58 +02:00
Roger Braun
1b086834bd Don't return html in the text field. 2017-04-12 17:22:29 +02:00
Roger Braun
b666f11d2f Add max_id fetching to activity fetching. 2017-04-12 17:12:00 +02:00
Roger Braun
6a179a44be Test friends timeline more thoroughly. 2017-04-12 16:53:46 +02:00
Roger Braun
8eea09889b Return directly addressed activities in friends timeline. 2017-04-12 16:45:23 +02:00
Roger Braun
15655d992e Fix user representation after following. 2017-04-12 16:38:55 +02:00
dtluna
65ef18a715 Add error messages for repeated follows and unfollows 2017-04-12 17:34:36 +03:00
dtluna
c0e5b3459f Add unfollowing using screen_name parameter 2017-04-10 16:45:47 +03:00
dtluna
896e40cd2b Add following using screen_name parameter 2017-04-10 16:38:21 +03:00
dtluna
59a406d94c Add test for help/test resource 2017-04-10 16:00:57 +03:00
dtluna
8075badafe Add Follow activity insertion 2017-04-04 03:30:07 +03:00
Roger Braun
a83fa053de Parse mentions, save them, output them in TwAPI. 2017-04-03 18:28:19 +02:00
Roger Braun
2e89d505d3 Connect attachments with objects, not activities. 2017-03-30 18:07:38 +02:00
Roger Braun
6aa1523bb3 Put objects in inserted activties into the db. 2017-03-30 18:07:29 +02:00
Roger Braun
73df2f8e5e Add attachments to the TwAPI. 2017-03-30 17:07:22 +02:00
Roger Braun
42c90855ba Basic ObjectRepresenter. 2017-03-30 16:08:49 +02:00
Roger Braun
e7dc39e40c Basic file uploading via TwAPI. 2017-03-29 02:07:56 +02:00
Roger Braun
d2cdcc097b Add conversation fetching to TwAPI controller. 2017-03-28 17:22:44 +02:00
Roger Braun
0dd3373304 Return statusnet_conversation_id in TwAPI. 2017-03-28 14:49:21 +02:00
Roger Braun
e25aea3fa7 Add conversation id to activities. 
This is for compatibility with the TwAPI.
 2017-03-28 14:40:09 +02:00
Roger Braun
bb07efdaab Fix spec. 2017-03-28 14:04:13 +02:00
Roger Braun
e4de0ddc77 Add single status fetching to TwAPI. 2017-03-24 01:16:28 +01:00
Roger Braun
866a2663d4 Add fetching of activities in context. 2017-03-24 00:09:08 +01:00
Roger Braun
ae50b165cc Add inReplyToStatus to TwAPI. 2017-03-24 00:00:06 +01:00
Roger Braun
e56dba1563 Add context and inReplyTo. 2017-03-23 23:34:10 +01:00
Roger Braun
74112ef99e Add id to objects, too. 2017-03-23 21:22:49 +01:00
Roger Braun
1f0f79d959 Generate ids for activities. 2017-03-23 17:56:49 +01:00
Roger Braun
9ad045fd58 Return user specific json for logged in users. 2017-03-23 15:51:34 +01:00
Roger Braun
30650e5bc6 Add unfollowing to TwAPI. 2017-03-23 13:13:09 +01:00
Roger Braun
75e51b190d Add following TwAPI endpoint. 2017-03-23 12:09:27 +01:00
Roger Braun
e2e0cd75b7 Add friends timeline. 2017-03-22 17:25:59 +01:00
Roger Braun
37e443ce6c Add friends status fetching. 2017-03-22 16:51:20 +01:00
Roger Braun
569d9bac17 Add fetching for recipients. 2017-03-22 14:45:17 +01:00
Roger Braun
2db28df4cf Add public timeline TwAPI. 2017-03-21 21:09:20 +01:00
Roger Braun
b9d0e34506 Add since_id for activitypub fetching. 2017-03-21 20:31:48 +01:00
Roger Braun
d4cf273f28 Add limiting to activity pub fetching. 2017-03-21 20:22:05 +01:00
Roger Braun
ad303783af Add status posting via TwAPI. 2017-03-21 18:17:35 +01:00
Roger Braun
9a8850eb9e Basic status creation and retrieval. 2017-03-21 17:53:20 +01:00
Roger Braun
8de523c8ae Basic AP objects. 2017-03-21 09:21:52 +01:00
Roger Braun
093fd1832d Add Twitter API verify_credentials endpoint. 2017-03-20 21:30:44 +01:00
Roger Braun
980717fdce Add Twitter API user representer. 2017-03-20 21:30:18 +01:00
Roger Braun
a93f3421a7 Phoenix skeleton 2017-03-17 17:09:58 +01:00
rinpatch
4a6855d9ee Provide plaintext representations of content/cw in MastoAPI 2017-01-01 03:10:08 +03:00
Egor Kislitsyn
9abf832b03 Merge remote-tracking branch 'pleroma/develop' into use-jobs-in-webpush 2019-04-08 18:48:10 +07:00
lambda
e19590c93f Merge branch 'improve_upgrade_user_from_ap_id' into 'develop' 
Improve Transmogrifier.upgrade_user_from_ap_id/2

See merge request pleroma/pleroma!1019
 2019-04-08 11:42:20 +00:00
lambda
fd45cab9ec Merge branch 'twitter_oauth' into 'develop' 
OAuth consumer (sign in / sign up with external provider)

See merge request pleroma/pleroma!923
 2019-04-08 11:41:50 +00:00
Alexander Strizhakov
36c0a10fdf adding language tag 2019-04-08 11:03:10 +00:00
lambda
23067908de Merge branch 'feature/770-add-emoji-tags' into 'develop' 
Feature/770 add emoji tags

See merge request pleroma/pleroma!998
 2019-04-08 09:50:00 +00:00
Egor Kislitsyn
c3d5c3513a Merge remote-tracking branch 'pleroma/develop' into use-jobs-in-webpush 2019-04-08 16:46:59 +07:00
Ivan Tashkinov
44829d9181 AdminApiControllerTest unused variables fix. 2019-04-08 12:32:55 +03:00
Egor Kislitsyn
a1a854646e Merge branch 'develop' into use-jobs-in-webpush 2019-04-08 16:29:20 +07:00
Ivan Tashkinov
bffddf5e31 [#923] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth 
# Conflicts:
#	docs/config.md
#	test/support/factory.ex
 2019-04-08 12:20:26 +03:00
lambda
b4da2bc1d0 Merge branch 'develop' into 'improve_upgrade_user_from_ap_id' 
# Conflicts:
#   config/config.exs
#   docs/config.md
 2019-04-08 09:18:01 +00:00
lambda
b177e1e7f3 Merge branch 'scheduled-activities' into 'develop' 
Scheduled activities

See merge request pleroma/pleroma!989
 2019-04-08 09:08:18 +00:00
feld
fb2040d061 Merge branch 'fix/deactivated-user-error' into 'develop' 
Return 403 for deactivated user on token request

Closes #785

See merge request pleroma/pleroma!1031
 2019-04-06 22:19:30 +00:00
eugenijm
2056efa714 Add scheduler for sending scheduled activities to the queue 2019-04-06 23:56:29 +03:00
eugenijm
fc92a0fd8d Added limits and media attachments for scheduled activities. 2019-04-06 23:55:58 +03:00
eugenijm
b3870df51f Handle scheduled_at on status creation. 2019-04-06 23:55:58 +03:00
eugenijm
7bf622ce73 Add scheduled activities 2019-04-06 23:55:58 +03:00
eugenijm
7aa53d52bd Return 403 on oauth token exchange for a deactivated user 2019-04-06 23:27:55 +03:00
Alex S
7410aee886 Merge develop to 770-add-emoji-tags 
Merge conflict in test/web/mastodon_api/mastodon_api_controller_test.exs
 2019-04-06 20:34:00 +07:00
Egor Kislitsyn
f1712cd2f1 Use PleromaJobQueue in Pleroma.Web.Push 2019-04-05 19:38:44 +07:00
Ivan Tashkinov
47a236f753 [#923] OAuth consumer mode refactoring, new tests, tests adjustments, readme. 2019-04-05 15:12:02 +03:00
Ivan Tashkinov
3e7f2bfc2f [#923] OAuthController#callback adjustments (with tests). 2019-04-05 09:19:17 +03:00
Ivan Tashkinov
45765918c3 [#923] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth 
# Conflicts:
#	mix.exs
 2019-04-04 23:43:08 +03:00
Ivan Tashkinov
f7cd9131d4 [#923] OAuth consumer controller tests. Misc. improvements. 2019-04-04 22:41:03 +03:00
Egor Kislitsyn
cfa6e7289f Improve Transmogrifier.upgrade_user_from_ap_id/2 2019-04-04 16:10:43 +07:00
Alex S
fa8483cb80 Merging develop into feature/770-add-emoji-tags 
Conflict test/web/twitter_api/util_controller_test.exs
 2019-04-02 20:39:52 +07:00
Alex S
9e0567ec52 Merge develop into feature/770-add-emoji-tags 2019-04-02 19:16:29 +07:00
Alex S
3601f03147 Adding tag to emoji ets table 
changes in apis
 2019-04-01 17:17:57 +07:00