akkoma
5 years agoMerge branch 'bugfix/missing-announces' into 'develop'
rinpatch [Mon, 25 Mar 2019 09:24:08 +0000 (09:24 +0000)]
Merge branch 'bugfix/missing-announces' into 'develop'

fix up missing announcements with preloads

See merge request pleroma/pleroma!972

5 years agofix up missing announcements with preloads
William Pitcock [Mon, 25 Mar 2019 03:32:19 +0000 (03:32 +0000)]
fix up missing announcements with preloads

5 years agoMerge branch 'features/s3-uploader-digital-ocean' into 'develop'
kaniini [Mon, 25 Mar 2019 02:25:59 +0000 (02:25 +0000)]
Merge branch 'features/s3-uploader-digital-ocean' into 'develop'

add overriding truncated_namespace condition for truncating paths for digital ocean

See merge request pleroma/pleroma!969

5 years agoMerge branch 'fix/mastoapi-liked' into 'develop'
kaniini [Mon, 25 Mar 2019 02:24:27 +0000 (02:24 +0000)]
Merge branch 'fix/mastoapi-liked' into 'develop'

Serve non-public activities in /api/v1/favourites

Closes #648

See merge request pleroma/pleroma!970

5 years agoServe non-public activities in /api/v1/favourites
rinpatch [Sun, 24 Mar 2019 23:15:45 +0000 (02:15 +0300)]
Serve non-public activities in /api/v1/favourites

Fixes #648

5 years agoadd overriding truncated_namespace condition for truncating paths for digital ocean
Austin Lanari [Sun, 24 Mar 2019 18:32:09 +0000 (11:32 -0700)]
add overriding truncated_namespace condition for truncating paths for digital ocean

5 years agoMerge branch 'features/mrf-keyword-nil-summary' into 'develop'
rinpatch [Sun, 24 Mar 2019 15:02:13 +0000 (15:02 +0000)]
Merge branch 'features/mrf-keyword-nil-summary' into 'develop'

mrf/keyword_policy.ex: Fix when summary == nil, do not whitelist content == nil

See merge request pleroma/pleroma!968

5 years agomrf/keyword_policy.ex: Fix when summary == nil, do not whitelist content == nil
Haelwenn (lanodan) Monnier [Sun, 24 Mar 2019 14:47:50 +0000 (15:47 +0100)]
mrf/keyword_policy.ex: Fix when summary == nil, do not whitelist content == nil

5 years agoMerge branch 'fix/eldap-warnings' into 'develop'
rinpatch [Sun, 24 Mar 2019 11:17:40 +0000 (11:17 +0000)]
Merge branch 'fix/eldap-warnings' into 'develop'

Ignore compilation warnings for undefined module :eldap

See merge request pleroma/pleroma!956

5 years agoMerge branch 'feature/object-normalize-preload' into 'develop'
kaniini [Sun, 24 Mar 2019 02:31:56 +0000 (02:31 +0000)]
Merge branch 'feature/object-normalize-preload' into 'develop'

preloaded object normalization

See merge request pleroma/pleroma!967

5 years agotests: fix up activity collision test
William Pitcock [Sat, 23 Mar 2019 03:16:50 +0000 (03:16 +0000)]
tests: fix up activity collision test

5 years agoactivity: use left join instead of inner join when fetching activities that may or...
William Pitcock [Sat, 23 Mar 2019 03:13:19 +0000 (03:13 +0000)]
activity: use left join instead of inner join when fetching activities that may or may not have a child object

5 years agouser: use preloads when deleting accounts
William Pitcock [Sat, 23 Mar 2019 03:04:42 +0000 (03:04 +0000)]
user: use preloads when deleting accounts

5 years agoostatus: use preload objects with Object.normalize() when opportunistic
William Pitcock [Sat, 23 Mar 2019 03:03:06 +0000 (03:03 +0000)]
ostatus: use preload objects with Object.normalize() when opportunistic

5 years agoobject: downgrade normalize warning to debug severity
William Pitcock [Sat, 23 Mar 2019 03:00:04 +0000 (03:00 +0000)]
object: downgrade normalize warning to debug severity

5 years agoactivitypub: object view: use preloaded object when possible
William Pitcock [Sat, 23 Mar 2019 02:49:40 +0000 (02:49 +0000)]
activitypub: object view: use preloaded object when possible

5 years agoactivity: add get_by_ap_id_with_object()
William Pitcock [Sat, 23 Mar 2019 02:49:10 +0000 (02:49 +0000)]
activity: add get_by_ap_id_with_object()

5 years agoactivitypub: when fetching objects, use the preloaded object from the synthesized...
William Pitcock [Sat, 23 Mar 2019 02:38:59 +0000 (02:38 +0000)]
activitypub: when fetching objects, use the preloaded object from the synthesized activity

5 years agonotification: formatting
William Pitcock [Sat, 23 Mar 2019 02:30:53 +0000 (02:30 +0000)]
notification: formatting

5 years agostreamer: use the preloaded object if possible
William Pitcock [Sat, 23 Mar 2019 02:27:52 +0000 (02:27 +0000)]
streamer: use the preloaded object if possible

5 years agorich media: helpers: only crawl Create activities
William Pitcock [Sat, 23 Mar 2019 02:26:49 +0000 (02:26 +0000)]
rich media: helpers: only crawl Create activities

5 years agonotification: preload child objects
William Pitcock [Sat, 23 Mar 2019 02:19:34 +0000 (02:19 +0000)]
notification: preload child objects

5 years agorelay: use preloaded object since we always have it
William Pitcock [Sat, 23 Mar 2019 01:33:41 +0000 (01:33 +0000)]
relay: use preloaded object since we always have it

5 years agorelay test: don't do preloading (since follow objects are activities, it's a mess)
William Pitcock [Sat, 23 Mar 2019 01:23:02 +0000 (01:23 +0000)]
relay test: don't do preloading (since follow objects are activities, it's a mess)

5 years agoostatus: fetch preloaded object in note handler for testsuite
William Pitcock [Sat, 23 Mar 2019 01:17:26 +0000 (01:17 +0000)]
ostatus: fetch preloaded object in note handler for testsuite

5 years agoactivitypub: allow skipping preload in some cases (like certain tests where the prelo...
William Pitcock [Sat, 23 Mar 2019 01:09:12 +0000 (01:09 +0000)]
activitypub: allow skipping preload in some cases (like certain tests where the preload is obnoxious)

5 years agoactivitypub: add missing with_preloaded_object()
William Pitcock [Sat, 23 Mar 2019 00:53:35 +0000 (00:53 +0000)]
activitypub: add missing with_preloaded_object()

5 years agoactivitypub: splice in the child object if we have one
William Pitcock [Sat, 23 Mar 2019 00:40:08 +0000 (00:40 +0000)]
activitypub: splice in the child object if we have one

5 years agoformatting
William Pitcock [Sat, 23 Mar 2019 00:28:16 +0000 (00:28 +0000)]
formatting

5 years agoactivity: fix credo nitpick
William Pitcock [Sat, 23 Mar 2019 00:24:23 +0000 (00:24 +0000)]
activity: fix credo nitpick

5 years agorich media: use optimized Object.normalize()
William Pitcock [Sat, 23 Mar 2019 00:22:57 +0000 (00:22 +0000)]
rich media: use optimized Object.normalize()

5 years agocommon api: use the optimized Object.normalize whenever possible
William Pitcock [Sat, 23 Mar 2019 00:22:14 +0000 (00:22 +0000)]
common api: use the optimized Object.normalize whenever possible

5 years agoactivitypub: preload child objects when fetching timelines
William Pitcock [Sat, 23 Mar 2019 00:10:17 +0000 (00:10 +0000)]
activitypub: preload child objects when fetching timelines

5 years agoactivity: add with_preloaded_object() convenience
William Pitcock [Sat, 23 Mar 2019 00:09:56 +0000 (00:09 +0000)]
activity: add with_preloaded_object() convenience

5 years agoobject: add support for preloading objects when walking an activity graph in normal...
William Pitcock [Fri, 22 Mar 2019 23:34:47 +0000 (23:34 +0000)]
object: add support for preloading objects when walking an activity graph in normal form

5 years agoMerge branch 'hotfix/null-content' into 'develop'
rinpatch [Fri, 22 Mar 2019 21:17:00 +0000 (21:17 +0000)]
Merge branch 'hotfix/null-content' into 'develop'

Fix text being nullable in TwitterAPI

See merge request pleroma/pleroma!966

5 years agoFix text being nullable in TwitterAPI
rinpatch [Fri, 22 Mar 2019 21:10:50 +0000 (00:10 +0300)]
Fix text being nullable in TwitterAPI

5 years agoMerge branch 'safe-mentions' into 'develop'
lambda [Fri, 22 Mar 2019 11:03:56 +0000 (11:03 +0000)]
Merge branch 'safe-mentions' into 'develop'

NodeInfo: Return safe_dm_mentions feature flag.

See merge request pleroma/pleroma!964

5 years agoNodeInfo: Return safe_dm_mentions feature flag.
lain [Fri, 22 Mar 2019 10:57:20 +0000 (11:57 +0100)]
NodeInfo: Return safe_dm_mentions feature flag.

5 years agoMerge branch 'fix/use-union-all' into 'develop'
kaniini [Fri, 22 Mar 2019 07:00:04 +0000 (07:00 +0000)]
Merge branch 'fix/use-union-all' into 'develop'

Ensure fts is prefered over trigram and use union_all instead of union in user search query

See merge request pleroma/pleroma!963

5 years agoEnsure fts is prefered over trigram and use union_all instead of union in user search...
rinpatch [Fri, 22 Mar 2019 05:39:49 +0000 (08:39 +0300)]
Ensure fts is prefered over trigram and use union_all instead of union in user search query

5 years agoMerge branch 'reports/fix-remote-reporting-emails' into 'develop'
kaniini [Fri, 22 Mar 2019 01:35:54 +0000 (01:35 +0000)]
Merge branch 'reports/fix-remote-reporting-emails' into 'develop'

reports: fix up email generation for remote reports

See merge request pleroma/pleroma!962

5 years agoreports: fix up email generation for remote reports
William Pitcock [Fri, 22 Mar 2019 01:17:14 +0000 (01:17 +0000)]
reports: fix up email generation for remote reports

5 years agoMerge branch 'safe-mentions' into 'develop'
kaniini [Fri, 22 Mar 2019 00:50:24 +0000 (00:50 +0000)]
Merge branch 'safe-mentions' into 'develop'

Add safe dm mode option.

See merge request pleroma/pleroma!958

5 years agoMerge branch 'feature/mastoapi-ext-conversation-id' into 'develop'
kaniini [Fri, 22 Mar 2019 00:25:35 +0000 (00:25 +0000)]
Merge branch 'feature/mastoapi-ext-conversation-id' into 'develop'

Mastodon API: add conversation_id extension

See merge request pleroma/pleroma!961

5 years agotests: fixup
William Pitcock [Thu, 21 Mar 2019 23:37:00 +0000 (23:37 +0000)]
tests: fixup

5 years agodocs: document `conversation_id` extension
William Pitcock [Thu, 21 Mar 2019 23:27:42 +0000 (23:27 +0000)]
docs: document `conversation_id` extension

5 years agomastodon api: add conversation_id extension (ref #674)
William Pitcock [Thu, 21 Mar 2019 23:25:41 +0000 (23:25 +0000)]
mastodon api: add conversation_id extension (ref #674)

5 years agocommon api: move context functions from twitterapi
William Pitcock [Thu, 21 Mar 2019 23:17:53 +0000 (23:17 +0000)]
common api: move context functions from twitterapi

5 years agoMerge branch 'feature/move-search-to-db' into 'develop'
kaniini [Thu, 21 Mar 2019 21:41:04 +0000 (21:41 +0000)]
Merge branch 'feature/move-search-to-db' into 'develop'

Move gluing search results from application to database and get mutuals a higher score multiplier

See merge request pleroma/pleroma!960

5 years agoMove gluing search results from application to database and get mutuals
rinpatch [Thu, 21 Mar 2019 20:16:32 +0000 (23:16 +0300)]
Move gluing search results from application to database and get mutuals
a higher score multiplier

5 years agoMerge branch 'feature/gopher-dstport' into 'develop'
rinpatch [Thu, 21 Mar 2019 17:08:40 +0000 (17:08 +0000)]
Merge branch 'feature/gopher-dstport' into 'develop'

Add a gopher url port config option

See merge request pleroma/pleroma!959

5 years agoAdd a gopher url port config option
Quentin Rameau [Mon, 18 Mar 2019 14:47:58 +0000 (15:47 +0100)]
Add a gopher url port config option

This lets the user advertise a different port in the gopher urls,
for example listening locally on port 7070 but telling clients to
connect to the regular port 70.

5 years agoMerge branch 'ecto-3-migration' into 'develop'
rinpatch [Thu, 21 Mar 2019 16:24:57 +0000 (16:24 +0000)]
Merge branch 'ecto-3-migration' into 'develop'

Ecto 3.0.7 (ecto_sql 3.0.5) migration

See merge request pleroma/pleroma!957

5 years agoUtilController: Return state of safe dm mentions.
lain [Thu, 21 Mar 2019 15:16:26 +0000 (16:16 +0100)]
UtilController: Return state of safe dm mentions.

5 years agoSkip tests in LDAPAuthorizationTest if :eldap module is unavailable
link0ff [Thu, 21 Mar 2019 10:31:16 +0000 (12:31 +0200)]
Skip tests in LDAPAuthorizationTest if :eldap module is unavailable

5 years agoMerge branch 'imageoptim' into 'develop'
kaniini [Thu, 21 Mar 2019 00:59:24 +0000 (00:59 +0000)]
Merge branch 'imageoptim' into 'develop'

used imageOptim to reduce size of image files

See merge request pleroma/pleroma!944

5 years agoAdd safe dm mode option.
lain [Wed, 20 Mar 2019 20:09:36 +0000 (21:09 +0100)]
Add safe dm mode option.

5 years agomodify the migrations to use naive_datetime_usec
rinpatch [Wed, 20 Mar 2019 13:16:29 +0000 (16:16 +0300)]
modify the migrations to use naive_datetime_usec

5 years agoFix filter migration
rinpatch [Wed, 20 Mar 2019 13:13:23 +0000 (16:13 +0300)]
Fix filter migration

5 years agoFix migration timestamp type
rinpatch [Wed, 20 Mar 2019 13:04:59 +0000 (16:04 +0300)]
Fix migration timestamp type

5 years agoEcto 3.0.5 migration
rinpatch [Wed, 20 Mar 2019 12:59:27 +0000 (15:59 +0300)]
Ecto 3.0.5 migration

kms

5 years agoIgnore compilation warnings for undefined module :eldap
link0ff [Wed, 20 Mar 2019 11:28:06 +0000 (13:28 +0200)]
Ignore compilation warnings for undefined module :eldap

5 years agoMerge branch '2019-03-20-update-frontend' into 'develop'
lambda [Wed, 20 Mar 2019 08:07:25 +0000 (08:07 +0000)]
Merge branch '2019-03-20-update-frontend' into 'develop'

Update frontend

See merge request pleroma/pleroma!955

5 years agoUpdate frontend
lain [Wed, 20 Mar 2019 07:58:25 +0000 (08:58 +0100)]
Update frontend

5 years agoMerge branch 'fix/search-users-for-admin' into 'develop'
kaniini [Wed, 20 Mar 2019 00:37:20 +0000 (00:37 +0000)]
Merge branch 'fix/search-users-for-admin' into 'develop'

Rework users search

Closes admin-fe#12

See merge request pleroma/pleroma!954

5 years agoFormat
Maxim Filippov [Tue, 19 Mar 2019 22:40:50 +0000 (01:40 +0300)]
Format

5 years agoUse ILIKE to search users
Maxim Filippov [Tue, 19 Mar 2019 22:37:40 +0000 (01:37 +0300)]
Use ILIKE to search users

5 years agoMerge branch 'bugfix/activitypub-public' into 'develop'
kaniini [Tue, 19 Mar 2019 21:36:20 +0000 (21:36 +0000)]
Merge branch 'bugfix/activitypub-public' into 'develop'

activitypub addressing improvements

Closes #730 and #739

See merge request pleroma/pleroma!953

5 years agotransmogrifier: upgrade: when upgrading OStatus users to AP, ensure we always use...
William Pitcock [Tue, 19 Mar 2019 18:39:33 +0000 (18:39 +0000)]
transmogrifier: upgrade: when upgrading OStatus users to AP, ensure we always use the fake collection

5 years agouser: properly cope with actors which do not declare a followers collection
William Pitcock [Tue, 19 Mar 2019 18:23:06 +0000 (18:23 +0000)]
user: properly cope with actors which do not declare a followers collection

5 years agotransmogrifier: when determining followers collection URI, we may need to fetch the...
William Pitcock [Tue, 19 Mar 2019 18:04:57 +0000 (18:04 +0000)]
transmogrifier: when determining followers collection URI, we may need to fetch the actor

5 years agotest: add test for list sanitization
William Pitcock [Tue, 19 Mar 2019 17:53:40 +0000 (17:53 +0000)]
test: add test for list sanitization

5 years agotests: add test for as:Public issues
William Pitcock [Tue, 19 Mar 2019 17:49:29 +0000 (17:49 +0000)]
tests: add test for as:Public issues

5 years agoactivitypub: transmogrifier: do not allow missing lists to be interpreted as nil
William Pitcock [Tue, 19 Mar 2019 17:30:25 +0000 (17:30 +0000)]
activitypub: transmogrifier: do not allow missing lists to be interpreted as nil

5 years agoactivitypub: transmogrifier: ensure as:Public activities are delivered to followers
William Pitcock [Tue, 19 Mar 2019 17:27:42 +0000 (17:27 +0000)]
activitypub: transmogrifier: ensure as:Public activities are delivered to followers

5 years agofix UploadTest to use new image_tmp.jpg
optikfluffel [Tue, 19 Mar 2019 09:02:24 +0000 (10:02 +0100)]
fix UploadTest to use new image_tmp.jpg

5 years agoused imageOptim to reduce size of image files
optikfluffel [Sat, 16 Mar 2019 13:08:18 +0000 (14:08 +0100)]
used imageOptim to reduce size of image files

5 years agoMerge branch 'feature/order-users-by-nickname-admin-api' into 'develop'
kaniini [Mon, 18 Mar 2019 23:08:31 +0000 (23:08 +0000)]
Merge branch 'feature/order-users-by-nickname-admin-api' into 'develop'

Order users by nickname

See merge request pleroma/pleroma!945

5 years agoMerge branch 'doc/mastodon-api-accounts-extension' into 'develop'
kaniini [Mon, 18 Mar 2019 20:32:24 +0000 (20:32 +0000)]
Merge branch 'doc/mastodon-api-accounts-extension' into 'develop'

Document additional pleroma changes to /api/v1/accounts/:id

See merge request pleroma/pleroma!952

5 years agoDocument additional pleroma changes to /api/v1/accounts/:id
Mark Felder [Mon, 18 Mar 2019 19:48:56 +0000 (19:48 +0000)]
Document additional pleroma changes to /api/v1/accounts/:id

5 years agoMerge branch 'masto-api-notifications' into 'develop'
kaniini [Mon, 18 Mar 2019 19:17:36 +0000 (19:17 +0000)]
Merge branch 'masto-api-notifications' into 'develop'

Add support for exclude_types, limit and min_id in Mastodon notifications

See merge request pleroma/pleroma!949

5 years agoMerge branch 'fix-initial-posts' into 'develop'
rinpatch [Mon, 18 Mar 2019 17:57:19 +0000 (17:57 +0000)]
Merge branch 'fix-initial-posts' into 'develop'

Check if the user has indeed not been federated with before fetching initial posts

See merge request pleroma/pleroma!951

5 years agoCheck if the user has indeed not been federated with
Ekaterina Vaartis [Mon, 18 Mar 2019 17:14:49 +0000 (20:14 +0300)]
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

5 years agoMerge branch 'add-is-seen-mastodon-api-doc' into 'develop'
rinpatch [Mon, 18 Mar 2019 09:58:51 +0000 (09:58 +0000)]
Merge branch 'add-is-seen-mastodon-api-doc' into 'develop'

Added documentation for Pleroma-specific is_seen in Mastodon API

See merge request pleroma/pleroma!948

5 years agoAdded support for exclude_types, limit, and min_id in Mastodon
eugenijm [Mon, 18 Mar 2019 01:32:23 +0000 (04:32 +0300)]
Added support for exclude_types, limit, and min_id in Mastodon
notifications.

Unify Mastodon-compatible pagination logic.

5 years agoAdded documentation for Pleroma-specific is_seen in Mastodon API
eugenijm [Mon, 18 Mar 2019 00:54:50 +0000 (03:54 +0300)]
Added documentation for Pleroma-specific is_seen in Mastodon API

5 years agoMerge branch 'feature/allow-link-rel-attribute' into 'develop'
kaniini [Mon, 18 Mar 2019 00:38:09 +0000 (00:38 +0000)]
Merge branch 'feature/allow-link-rel-attribute' into 'develop'

Allow 'rel' attribute on `<a>` link with specific values (for hashtag recognition).

See merge request pleroma/pleroma!946

5 years agoAllow 'rel' attribute on `<a>` link with specific values (for hashtag recognition).
Fong-Wan Chau [Sun, 17 Mar 2019 13:46:46 +0000 (09:46 -0400)]
Allow 'rel' attribute on `<a>` link with specific values (for hashtag recognition).

5 years agoMerge branch 'feature/order-users-by-nickname-admin-api' of git.pleroma.social:maxf...
Maxim Filippov [Sun, 17 Mar 2019 10:30:05 +0000 (13:30 +0300)]
Merge branch 'feature/order-users-by-nickname-admin-api' of git.pleroma.social:maxf/pleroma into feature/order-users-by-nickname-admin-api

5 years agoFix test
Maxim Filippov [Sun, 17 Mar 2019 10:29:28 +0000 (13:29 +0300)]
Fix test

5 years agoOrder users by nickname
Maxim Filippov [Sun, 17 Mar 2019 10:23:08 +0000 (13:23 +0300)]
Order users by nickname

5 years agoOrder users by nickname
Maxim Filippov [Sun, 17 Mar 2019 10:23:08 +0000 (13:23 +0300)]
Order users by nickname

5 years agoMerge branch 'feature/federated-flags' into 'develop'
kaniini [Sat, 16 Mar 2019 19:27:56 +0000 (19:27 +0000)]
Merge branch 'feature/federated-flags' into 'develop'

Federated reports

See merge request pleroma/pleroma!935

5 years agoMerge branch 'feature/oauth-me' into 'develop'
lambda [Sat, 16 Mar 2019 08:44:02 +0000 (08:44 +0000)]
Merge branch 'feature/oauth-me' into 'develop'

oauth: add me property to token responses

See merge request pleroma/pleroma!942

5 years agoMerge branch 'feature/reblog-muting' into 'develop'
kaniini [Sat, 16 Mar 2019 04:31:31 +0000 (04:31 +0000)]
Merge branch 'feature/reblog-muting' into 'develop'

Implement mastodon's reblog hiding feature

See merge request pleroma/pleroma!916

5 years agoMerge branch 'bugfix/ldap-test-fix' into 'develop'
kaniini [Sat, 16 Mar 2019 04:13:53 +0000 (04:13 +0000)]
Merge branch 'bugfix/ldap-test-fix' into 'develop'

test: fix defective ldap setup/teardown

See merge request pleroma/pleroma!943

5 years agotest: fix defective ldap setup/teardown
William Pitcock [Sat, 16 Mar 2019 04:05:19 +0000 (04:05 +0000)]
test: fix defective ldap setup/teardown

5 years agooauth: add me property to token responses
William Pitcock [Sat, 16 Mar 2019 01:12:50 +0000 (01:12 +0000)]
oauth: add me property to token responses

5 years agoMerge branch 'mark-notifications-as-read' into 'develop'
kaniini [Sat, 16 Mar 2019 00:30:04 +0000 (00:30 +0000)]
Merge branch 'mark-notifications-as-read' into 'develop'

Allow to mark a single notification as read

See merge request pleroma/pleroma!941