nocebo/akkoma
1
0
Fork 0
forked from AkkomaGang/akkoma
Code Issues Pull requests Projects Releases Packages Wiki Activity
6261 commits 3 branches 74 tags 313 MiB
Commit graph

453 commits

Author SHA1 Message Date
Egor Kislitsyn
99f70c7e20 Use Pleroma.Config everywhere 2019-05-30 15:33:58 +07:00
Roman Chvanikov
ce47017c89 Merge develop 2019-05-29 18:18:22 +03:00
William Pitcock
045803346d move key generation functions into Pleroma.Keys module 2019-05-22 03:58:15 +00:00
Sadposter
daeae8e2e7
Move default mascot configuration to config/ 2019-05-20 16:12:55 +01:00
lain
249b31ffe5 Fix specs. 2019-05-17 11:49:13 +02:00
Alexander Strizhakov
7ed682213f Fix/902 random compile failing 2019-05-17 07:25:20 +00:00
Sergey Suprunenko
2c303afc8b Remove duplicated entries in users' following lists 2019-05-16 20:04:08 +00:00
Alexander Strizhakov
73ae58fdfa Feature/896 toggling confirmation 2019-05-16 13:23:41 +00:00
Mark Felder
1caa6331ea Group def perform() together to fix the build 2019-05-14 12:33:03 -05:00
lambda
692919c7d2 Merge branch 'refactor/use-job-queue-everywhere' into 'develop' 
use job queue everywhere

Closes #862

See merge request pleroma/pleroma!1142
 2019-05-14 15:27:34 +00:00
William Pitcock
ac3a3abf6b clean up follow/block imports a little 2019-05-14 15:07:38 +00:00
Egor Kislitsyn
b92c004ea8 Reuse query from User.restrict_deactivated/1 2019-05-14 18:29:10 +07:00
Egor Kislitsyn
5e2b491276 Merge remote-tracking branch 'pleroma/develop' into feature/disable-account 2019-05-14 18:15:56 +07:00
William Pitcock
69a9e0563c user: migrate follow/blocks import to job queue 2019-05-13 19:36:00 +00:00
William Pitcock
32d4630c9c user: move initial post fetching to job queue 2019-05-13 19:36:00 +00:00
Alexander Strizhakov
a2be420f94 differences_in_mastoapi_responses.md: fullname & bio are optionnal 
[ci skip]
 2019-05-13 18:35:45 +00:00
Roman Chvanikov
f1f7a11222 Merge develop 2019-05-11 14:45:54 +07:00
Alexander Strizhakov
bfeb33e951 Merge develop 
Merge conflict in lib/pleroma/activity.ex
 2019-05-08 14:34:36 +00:00
Roman Chvanikov
b6b5b16ba4 Merge develop 2019-05-08 17:08:06 +07:00
rinpatch
06947c9147 Remove bookmarks assoc 2019-05-07 19:33:22 +00:00
Egor Kislitsyn
1557b99beb Merge remote-tracking branch 'pleroma/develop' into feature/disable-account 2019-05-07 16:51:11 +07:00
Alexander Strizhakov
ce6ca0fefe Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into feature/845-improve-status-deletion 2019-05-06 16:45:22 +00:00
Haelwenn (lanodan) Monnier
d70af32127
Pleroma.User: remove emojify on parse_bio 2019-05-03 16:27:50 +02:00
Alex S
f11e7037c2 test fixes 2019-05-01 16:09:53 +07:00
Alex S
bdfa3a6fa8 Merging with develop 
Conflicts:
lib/pleroma/web/activity_pub/transmogrifier.ex
lib/pleroma/user.ex
 2019-05-01 12:29:33 +07:00
Roman Chvanikov
0f0cc2703b Merge develop 2019-04-30 20:17:52 +07:00
Alex S
229ce6abbc migration without using old field name 
removing old field from db, after bookmarks migration
 2019-04-25 13:42:10 +07:00
Egor Kislitsyn
c157e27a00 Merge branch 'develop' into feature/disable-account 2019-04-25 13:41:10 +07:00
Alex S
324c9c8ab5 migrate user.bookmarks to separate table 2019-04-25 13:38:24 +07:00
Alex S
73d01857e3 bookmarks in separate table 2019-04-25 13:38:24 +07:00
Egor
b9cdf6d3b9 Use User.get_cached* everywhere 2019-04-22 07:20:43 +00:00
Egor Kislitsyn
e8c2f9a73a Merge remote-tracking branch 'pleroma/develop' into feature/disable-account 2019-04-22 13:08:30 +07:00
Roman Chvanikov
64a2c6a041 Digest emails 2019-04-20 19:42:19 +07:00
Roman Chvanikov
bc7862106d Fix tests 2019-04-19 23:26:41 +07:00
Roman Chvanikov
8add119444 Add User.list_inactive_users_query/1 2019-04-19 22:19:00 +07:00
Roman Chvanikov
2f0203a4a1 Resolve conflicts 2019-04-17 16:59:05 +07:00
Sadposter
e513504e88 Revert "Assert on the success of enqueue before returning" 
This reverts commit 16d8c8b33b.
Because it breaks everything
 2019-04-14 16:12:54 +01:00
Sadposter
16d8c8b33b Assert on the success of enqueue before returning 2019-04-14 16:05:26 +01:00
Sadposter
5e45557751 Always return {atom, _} from try_send_confirmation 2019-04-14 16:01:48 +01:00
Sadposter
ec42b639a3 fix pattern match on user registration 
deliver_async will return a single atom
 2019-04-14 15:46:54 +01:00
lambda
184ae60b21 Merge branch 'bugfix/pleroma-email-naming' into 'develop' 
Make the filename and module name of Pleroma.Emails.* orthogonal

See merge request pleroma/pleroma!1029
 2019-04-12 10:41:09 +00:00
Egor Kislitsyn
dd097a406b add tests 2019-04-12 16:38:32 +07:00
Egor Kislitsyn
46bd5c1d87 fix format 2019-04-11 17:28:12 +07:00
Egor Kislitsyn
db4badc6aa move user disable into deactivation 2019-04-11 17:22:42 +07:00
Egor Kislitsyn
0f2f7d2cec Merge remote-tracking branch 'pleroma/develop' into feature/disable-account 2019-04-11 15:51:52 +07:00
Sadposter
be8350baa2
Merge branch 'develop' into feature/user-status-subscriptions 2019-04-10 10:44:54 +01:00
Haelwenn (lanodan) Monnier
9c1b36856b
s/Pleroma.UserEmail/Pleroma.Emails.UserEmail/ 2019-04-10 06:33:20 +02:00
Haelwenn (lanodan) Monnier
1791ee8ec4
s/Pleroma.Mailer/Pleroma.Emails.Mailer/ 2019-04-10 06:33:19 +02:00
kaniini
97395e013e Merge branch 'notification-pleroma-settings' into 'develop' 
Notification controls

Closes #738

See merge request pleroma/pleroma!988
 2019-04-10 02:10:31 +00:00
lambda
0a02ed7a2f Merge branch 'bugfix/follower_count' into 'develop' 
update the follower count when a follower is blocked

See merge request pleroma/pleroma!1033
 2019-04-09 07:30:38 +00:00
Sachin Joshi
07afb9b537 update the follower count when a follower is blocked 2019-04-09 09:15:45 +05:45
Sadposter
589629cf3e
Used cached user resources in subscriptions 2019-04-08 15:56:14 +01:00
Sadposter
87a01f9ee0
Use Pleroma.Config instead of Application.get_env 2019-04-08 13:04:30 +01:00
Sadposter
13ff312c48
Sever subscription in case of block 2019-04-08 12:46:12 +01:00
Sadposter
9ca91cbb87 Change relationship direction of subscriptions 2019-04-05 17:02:07 +01:00
Sadposter
d56866c824 Add subscribed status to user view 
Added in pleroma extensions, but can be moved whenever
 2019-04-05 15:30:31 +01:00
Sadposter
316fe20d86 Make subscriptions the same direction as blocks 
That being, user - subscribes to -> users, rather than
user - has subscribers -> users
 2019-04-05 15:30:26 +01:00
Sadposter
007762e767 Add notification checks 2019-04-05 15:30:23 +01:00
Sadposter
79910ce5cc Add API endpoints and user column for subscription 2019-04-05 15:30:18 +01: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
lambda
ce9284b36f Merge branch 'remove-user-activities' into 'develop' 
[#757] Add mix task to delete user's activities

See merge request pleroma/pleroma!1008
 2019-04-02 12:45:29 +00:00
Ivan Tashkinov
37925cbe78 Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth 
# Conflicts:
#	lib/pleroma/web/oauth/oauth_controller.ex
#	lib/pleroma/web/router.ex
 2019-04-02 14:05:34 +03:00
Egor Kislitsyn
1b3d921921 change Repo.get(User, id) => User.get_by_id(id) 2019-04-02 17:01:26 +07:00
Egor Kislitsyn
a14742f495 add user delete_activities mix task 2019-04-02 16:30:11 +07:00
Egor Kislitsyn
a1869f5272 Merge remote-tracking branch 'pleroma/develop' into remove-user-activities 2019-04-02 15:41:30 +07:00
Ivan Tashkinov
baffdcc480 [#923] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth 
# Conflicts:
#	mix.exs
 2019-04-01 08:49:32 +03:00
eugenijm
cd90695a34 Add PUT /api/pleroma/notification_settings endpoint 2019-03-28 18:55:16 +03:00
Ivan Tashkinov
20e0f36605 Merge remote-tracking branch 'remotes/origin/develop' into twitter_oauth 2019-03-27 15:41:40 +03:00
lambda
926bf114b7 Merge branch 'feature/more-user-filters' into 'develop' 
Add more user filters + move search to its own module

See merge request pleroma/pleroma!982
 2019-03-27 11:33:13 +00:00
Maxim Filippov
3cf7539bca Add more user filters + move search to its own module 2019-03-27 03:51:59 +05:00
lambda
ff3b09f6b3 Merge branch 'fix/ap-icon' into 'develop' 
Do not federate instance avatar

Closes #759

See merge request pleroma/pleroma!977
 2019-03-26 16:12:50 +00:00
lain
10a7a4a868 AP UserView: Refactor banner / avatar display code, add test. 2019-03-26 16:59:28 +01:00
Ivan Tashkinov
263ca3dea2 Mastodon-based auth error messages. Defaulted User#auth_active?/1 to true. 2019-03-26 15:09:06 +03:00
Mark Felder
6f090f981b Attempt to fix incorrect federation of default instance avatars 2019-03-25 18:47:04 -05:00
William Pitcock
332dc1371b user: use preloads when deleting accounts 2019-03-23 03:06:00 +00:00
rinpatch
3229c7a1d6 Ensure fts is prefered over trigram and use union_all instead of union in user search query 2019-03-22 08:39:49 +03:00
rinpatch
88096c65a5 Move gluing search results from application to database and get mutuals 
a higher score multiplier
 2019-03-21 23:16:32 +03:00
rinpatch
b92a16aa00 Merge branch 'ecto-3-migration' into 'develop' 
Ecto 3.0.7 (ecto_sql 3.0.5) migration

See merge request pleroma/pleroma!957
 2019-03-21 16:24:57 +00:00
rinpatch
9a7b817c9a Ecto 3.0.5 migration 
kms
 2019-03-20 15:59:54 +03:00
Maxim Filippov
7ac9fff437 Format 2019-03-20 01:40:50 +03:00
Maxim Filippov
ed8a2935f5 Use ILIKE to search users 2019-03-20 01:37:40 +03:00
William Pitcock
67ff8d9311 user: properly cope with actors which do not declare a followers collection 2019-03-19 18:23:06 +00:00
kaniini
43bd7f47db Merge branch 'feature/order-users-by-nickname-admin-api' into 'develop' 
Order users by nickname

See merge request pleroma/pleroma!945
 2019-03-18 23:08:31 +00:00
Ekaterina Vaartis
a1aacc08a4 Check if the user has indeed not been federated with 
Just updating the user triggered post fetching too, now it
shouldn't. It only happened in the AP user fetching since that's
what's used to update users
 2019-03-18 20:16:31 +03:00
Ivan Tashkinov
8d21859717 [#923] External User registration refactoring, password randomization. 2019-03-18 18:09:53 +03:00
Zachary Dunn
97b35e00b0 Fix with expression always matching 2019-03-18 14:59:52 +00:00
Zachary Dunn
e572786dad Run 2019-03-18 14:53:30 +00:00
Zachary Dunn
af4338da0c Use better error message 2019-03-18 14:52:24 +00:00
Ivan Tashkinov
26b6354095 [#923] Support for multiple (external) registrations per user via Registration. 2019-03-18 17:23:38 +03:00
Zachary Dunn
a2e03d4f3c Initial attempt at updating return type 2019-03-18 13:56:59 +00:00
Ivan Tashkinov
2a96283efb [#923] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth 
# Conflicts:
#	config/config.exs
#	lib/pleroma/web/auth/pleroma_authenticator.ex
 2019-03-18 10:26:41 +03:00
Maxim Filippov
93291c3d7a Order users by nickname 2019-03-17 13:23:31 +03:00
Ivan Tashkinov
2739057442 Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth 2019-03-15 17:11:00 +03:00
Ivan Tashkinov
aacbf0f570 [#923] OAuth: prototype of sign in / sign up with Twitter. 2019-03-15 17:08:03 +03:00
Karen Konou
da53c079db Refactor to store user ap_id, add tests 2019-03-15 14:20:08 +01:00
Karen Konou
c8f31e0bc2 Implement mastodon's reblog hiding feature 2019-03-15 14:18:21 +01:00
Haelwenn (lanodan) Monnier
c42d34b2ec
[Credo] fix Credo.Check.Readability.MaxLineLength 2019-03-13 04:26:56 +01:00
Haelwenn (lanodan) Monnier
8cd3eada7d
[Credo] write large numbers with underscore separation 2019-03-13 04:26:56 +01:00
Haelwenn (lanodan) Monnier
fb82f6fc7c
[Credo] Remove parentesis on argument-less functions 2019-03-13 04:26:56 +01:00
Haelwenn (lanodan) Monnier
a3a9cec483
[Credo] fix Credo.Check.Readability.AliasOrder 2019-03-13 04:26:54 +01:00