akkoma
6 years agotests: add tests for Transmogrifier.maybe_fix_user_object()
William Pitcock [Sat, 19 May 2018 08:06:23 +0000 (08:06 +0000)]
tests: add tests for Transmogrifier.maybe_fix_user_object()

6 years agoactivitypub transmogrifier: handle hubzilla AP actor quirks
William Pitcock [Sat, 19 May 2018 07:30:02 +0000 (07:30 +0000)]
activitypub transmogrifier: handle hubzilla AP actor quirks

6 years agoactivitypub: normalize the actor to ensure we have its URI
William Pitcock [Sat, 19 May 2018 07:03:53 +0000 (07:03 +0000)]
activitypub: normalize the actor to ensure we have its URI

6 years agoFix User search.
lain [Wed, 16 May 2018 15:55:20 +0000 (17:55 +0200)]
Fix User search.

Now uses a trigram based search. This is a lot faster and gives better
results. Closes #185.

6 years agoupdate frontend
lain [Wed, 16 May 2018 11:02:53 +0000 (13:02 +0200)]
update frontend

6 years agoFix format.
lain [Sun, 13 May 2018 11:02:24 +0000 (13:02 +0200)]
Fix format.

6 years agoModify sort index for activities.
lain [Sun, 13 May 2018 10:54:08 +0000 (12:54 +0200)]
Modify sort index for activities.

This prevents a problem that made the local timeline very slow when
there were few posts.

6 years agoRevert "Remove 'unlisted' handling for now."
lain [Sun, 13 May 2018 10:38:13 +0000 (12:38 +0200)]
Revert "Remove 'unlisted' handling for now."

This reverts commit 1027d1f6963b495a5abc67b05447619ce7d429db.

6 years agoRemove 'unlisted' handling for now.
lain [Sun, 13 May 2018 10:07:11 +0000 (12:07 +0200)]
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.

6 years agoMerge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop
lain [Sun, 13 May 2018 09:59:35 +0000 (11:59 +0200)]
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop

6 years agoUnlisted fetching: Reverse logic
lain [Sun, 13 May 2018 09:58:03 +0000 (11:58 +0200)]
Unlisted fetching: Reverse logic

Generates a faster query.

6 years agoMerge branch 'feature/unrepeats' into 'develop'
lambda [Sun, 13 May 2018 09:32:29 +0000 (09:32 +0000)]
Merge branch 'feature/unrepeats' into 'develop'

Add unrepeats

Closes #69

See merge request pleroma/pleroma!113

6 years agoMerge branch 'kaniini/pleroma-bugfix/unlisted-statuses' into develop
lain [Sun, 13 May 2018 09:19:08 +0000 (11:19 +0200)]
Merge branch 'kaniini/pleroma-bugfix/unlisted-statuses' into develop

6 years agoAdd test.
lain [Sun, 13 May 2018 09:18:48 +0000 (11:18 +0200)]
Add test.

6 years agoFormat.
lain [Sun, 13 May 2018 08:56:44 +0000 (10:56 +0200)]
Format.

6 years agoMerge branch 'develop' into kaniini/pleroma-bugfix/unlisted-statuses
lain [Sun, 13 May 2018 08:56:11 +0000 (10:56 +0200)]
Merge branch 'develop' into kaniini/pleroma-bugfix/unlisted-statuses

6 years agoMerge branch 'patch-2' into 'develop'
lambda [Sun, 13 May 2018 08:39:37 +0000 (08:39 +0000)]
Merge branch 'patch-2' into 'develop'

Nginx config - secure defaults

See merge request pleroma/pleroma!146

6 years agoMerge branch 'feld-varnish' into 'develop'
lambda [Sun, 13 May 2018 08:34:58 +0000 (08:34 +0000)]
Merge branch 'feld-varnish' into 'develop'

More varnish fixes

See merge request pleroma/pleroma!149

6 years agoMerge branch 'feature/chain-policies' into 'develop'
lambda [Sun, 13 May 2018 08:24:18 +0000 (08:24 +0000)]
Merge branch 'feature/chain-policies' into 'develop'

chain policies

See merge request pleroma/pleroma!150

6 years agoMerge branch 'no-self-notification' into 'develop'
lambda [Sun, 13 May 2018 08:16:54 +0000 (08:16 +0000)]
Merge branch 'no-self-notification' into 'develop'

Do not create notification for yourself

Closes #121

See merge request pleroma/pleroma!148

6 years agoUse original status id instead of announce id
Francis Dinh [Sun, 13 May 2018 07:42:31 +0000 (03:42 -0400)]
Use original status id instead of announce id

6 years agoMerge branch 'feature/unrepeat-tests' into feature/unrepeats
Francis Dinh [Sat, 12 May 2018 15:11:13 +0000 (11:11 -0400)]
Merge branch 'feature/unrepeat-tests' into feature/unrepeats

6 years agoUpdate test fixture
Francis Dinh [Sat, 12 May 2018 15:10:49 +0000 (11:10 -0400)]
Update test fixture

6 years agoRevert "Log error when handling unrepeats"
Francis Dinh [Fri, 11 May 2018 19:34:46 +0000 (15:34 -0400)]
Revert "Log error when handling unrepeats"

This reverts commit c17c55e989a47f0722b115ffba48b7a1b45b7628.

6 years agoAdd tests for unrepeats
Francis Dinh [Fri, 11 May 2018 19:30:47 +0000 (15:30 -0400)]
Add tests for unrepeats

6 years agoLog error when handling unrepeats
Francis Dinh [Fri, 11 May 2018 19:29:19 +0000 (15:29 -0400)]
Log error when handling unrepeats

6 years agoProbably better way of handling non-follow undos in ostatus
Francis Dinh [Fri, 11 May 2018 15:59:53 +0000 (11:59 -0400)]
Probably better way of handling non-follow undos in ostatus

6 years agoRevert "Do not send non-follow undos over ostatus for now"
Francis Dinh [Fri, 11 May 2018 15:53:28 +0000 (11:53 -0400)]
Revert "Do not send non-follow undos over ostatus for now"

This reverts commit 07fdc072382007812dc6af80fa2912f6b6d987b8.

6 years agoRevert "Use [] instead of nil"
Francis Dinh [Fri, 11 May 2018 15:53:06 +0000 (11:53 -0400)]
Revert "Use [] instead of nil"

This reverts commit 42268b0981e47cacd9f27b985dcd0bf08819258b.

6 years agodo not create notification for yourself
Pierrick Brun [Mon, 7 May 2018 18:51:14 +0000 (20:51 +0200)]
do not create notification for yourself

6 years agoMerge branch 'patch-1' into 'develop'
lambda [Fri, 11 May 2018 07:18:25 +0000 (07:18 +0000)]
Merge branch 'patch-1' into 'develop'

Remove alias directive in service file

See merge request pleroma/pleroma!151

6 years agoUse [] instead of nil
Francis Dinh [Fri, 11 May 2018 05:48:56 +0000 (01:48 -0400)]
Use [] instead of nil

6 years agoDo not send non-follow undos over ostatus for now
Francis Dinh [Fri, 11 May 2018 05:45:10 +0000 (01:45 -0400)]
Do not send non-follow undos over ostatus for now

6 years agoRemove alias directive in service file
Normandy [Fri, 11 May 2018 05:19:20 +0000 (05:19 +0000)]
Remove alias directive in service file

Systemd will complain otherwise.

6 years agoformat & made get_policies/1 private
href [Thu, 10 May 2018 16:51:58 +0000 (18:51 +0200)]
format & made get_policies/1 private

6 years agoChain policies
href [Thu, 10 May 2018 16:34:09 +0000 (18:34 +0200)]
Chain policies

- The `:pleroma, :instance, :rewrite_policy` can now be either a policy
or a list of policies
- Made a behaviour for MRF policies

6 years agoMatch proper number of values from unannounce
Francis Dinh [Wed, 9 May 2018 04:04:14 +0000 (00:04 -0400)]
Match proper number of values from unannounce

6 years agoChange argument order and call correct # of args
Francis Dinh [Wed, 9 May 2018 03:59:36 +0000 (23:59 -0400)]
Change argument order and call correct # of args

6 years agoHandle Undo activites containing an Announce
Francis Dinh [Wed, 9 May 2018 03:50:19 +0000 (23:50 -0400)]
Handle Undo activites containing an Announce

6 years agoFederate correct activity
Francis Dinh [Wed, 9 May 2018 01:52:21 +0000 (21:52 -0400)]
Federate correct activity

6 years agoDon't strip headers from backend for /notice/ either
Mark Felder [Mon, 7 May 2018 23:44:40 +0000 (23:44 +0000)]
Don't strip headers from backend for /notice/ either

6 years agoCaching notice URLs does not produce pleasant results
Mark Felder [Mon, 7 May 2018 23:43:27 +0000 (23:43 +0000)]
Caching notice URLs does not produce pleasant results

6 years agoMore warning fixes.
lain [Mon, 7 May 2018 16:11:37 +0000 (18:11 +0200)]
More warning fixes.

6 years agoMerge branch 'feld-varnish' into 'develop'
lambda [Sun, 6 May 2018 18:43:57 +0000 (18:43 +0000)]
Merge branch 'feld-varnish' into 'develop'

Caching /objects/ URLs breaks them in Mastoweb as they don't redirect to the /notice/

See merge request pleroma/pleroma!110

6 years agoMerge branch 'feld-warnings' into 'develop'
lambda [Sun, 6 May 2018 18:42:31 +0000 (18:42 +0000)]
Merge branch 'feld-warnings' into 'develop'

Clean up warnings

See merge request pleroma/pleroma!144

6 years agoMerge branch 'fix/unsafe-variables' into 'develop'
lambda [Sun, 6 May 2018 18:41:46 +0000 (18:41 +0000)]
Merge branch 'fix/unsafe-variables' into 'develop'

Get rid of unsafe variables.

See merge request pleroma/pleroma!145

6 years agoAdded headers for a more secure default.
Artik Banana [Sun, 6 May 2018 14:19:29 +0000 (14:19 +0000)]
Added headers for a more secure default.

6 years agoGet rid of unsafe variables.
eal [Sun, 6 May 2018 06:58:59 +0000 (09:58 +0300)]
Get rid of unsafe variables.

6 years agoMerge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop
lain [Sat, 5 May 2018 11:41:27 +0000 (13:41 +0200)]
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop

6 years agoStreamer: Don't send out stream events for blocked users.
lain [Sat, 5 May 2018 11:40:47 +0000 (13:40 +0200)]
Streamer: Don't send out stream events for blocked users.

6 years agoUnify wss uri generation.
lain [Sat, 5 May 2018 11:40:31 +0000 (13:40 +0200)]
Unify wss uri generation.

6 years agoMerge branch 'feld-test.secret' into 'develop'
lambda [Sat, 5 May 2018 09:58:17 +0000 (09:58 +0000)]
Merge branch 'feld-test.secret' into 'develop'

Make it possible to use custom database connection parameters

See merge request pleroma/pleroma!143

6 years agoIdempotency: Use special cache, keep for 6 hours.
lain [Sat, 5 May 2018 09:15:57 +0000 (11:15 +0200)]
Idempotency: Use special cache, keep for 6 hours.

6 years agoGroup def renders here as well
Mark Felder [Fri, 4 May 2018 22:31:46 +0000 (22:31 +0000)]
Group def renders here as well

6 years agoGroup def renders together to fix warning
Mark Felder [Fri, 4 May 2018 22:28:13 +0000 (22:28 +0000)]
Group def renders together to fix warning

6 years agoMerge branch 'feld-test.secret' into feld-warnings
Mark Felder [Fri, 4 May 2018 22:05:19 +0000 (22:05 +0000)]
Merge branch 'feld-test.secret' into feld-warnings

6 years agoSpeling
Mark Felder [Fri, 4 May 2018 22:05:01 +0000 (22:05 +0000)]
Speling

6 years agoFix formatting
Mark Felder [Fri, 4 May 2018 22:03:14 +0000 (22:03 +0000)]
Fix formatting

6 years agoGroup response declarations together
Mark Felder [Fri, 4 May 2018 21:59:21 +0000 (21:59 +0000)]
Group response declarations together

6 years agoThat last change was stupid. Multiline comments in Elixir don't really exist.
Mark Felder [Fri, 4 May 2018 21:53:52 +0000 (21:53 +0000)]
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.

6 years agoDirty hack to remove the warning
Mark Felder [Fri, 4 May 2018 21:48:30 +0000 (21:48 +0000)]
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

6 years agoFix unused variables, imports, and aliases
Mark Felder [Fri, 4 May 2018 21:42:20 +0000 (21:42 +0000)]
Fix unused variables, imports, and aliases

6 years agoFix build. Too eager with the fixing of unused variables.
Mark Felder [Fri, 4 May 2018 21:26:33 +0000 (21:26 +0000)]
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

6 years agoClean up unused aliases and imports
Mark Felder [Fri, 4 May 2018 21:25:31 +0000 (21:25 +0000)]
Clean up unused aliases and imports

6 years agoMerge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop
lain [Fri, 4 May 2018 21:16:16 +0000 (23:16 +0200)]
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop

6 years agoMore unused variables
Mark Felder [Fri, 4 May 2018 21:16:02 +0000 (21:16 +0000)]
More unused variables

6 years agoupdate frontend
lain [Fri, 4 May 2018 21:15:33 +0000 (23:15 +0200)]
update frontend

6 years agoMerge branch 'feld-test.secret' into feld-warnings
Mark Felder [Fri, 4 May 2018 21:02:14 +0000 (21:02 +0000)]
Merge branch 'feld-test.secret' into feld-warnings

6 years agoMake it possible to use custom database connection parameters
Mark Felder [Fri, 4 May 2018 21:00:18 +0000 (21:00 +0000)]
Make it possible to use custom database connection parameters

6 years agoFix a bunch of unused variable warnings
Mark Felder [Fri, 4 May 2018 20:59:01 +0000 (20:59 +0000)]
Fix a bunch of unused variable warnings

6 years agoMerge branch 'feature/nodeinfo' into 'develop'
lambda [Fri, 4 May 2018 19:17:19 +0000 (19:17 +0000)]
Merge branch 'feature/nodeinfo' into 'develop'

Implements the nodeinfo endpoints

See merge request pleroma/pleroma!140

6 years agoDon't expire idempotency cache for five minutes.
lain [Fri, 4 May 2018 19:15:39 +0000 (21:15 +0200)]
Don't expire idempotency cache for five minutes.

6 years agoMastodonAPI: Support idempotency key.
lain [Fri, 4 May 2018 18:30:29 +0000 (20:30 +0200)]
MastodonAPI: Support idempotency key.

6 years agoFix formatting
Francis Dinh [Fri, 4 May 2018 07:19:48 +0000 (03:19 -0400)]
Fix formatting

6 years agoUse a variable for stats to avoid double call
Dashie [Thu, 3 May 2018 13:31:39 +0000 (15:31 +0200)]
Use a variable for stats to avoid double call

6 years agoAdd metadata.nodeName
Dashie [Thu, 3 May 2018 08:52:20 +0000 (10:52 +0200)]
Add metadata.nodeName

6 years agoReturn the right content-type for the schema call
Dashie [Thu, 3 May 2018 08:50:02 +0000 (10:50 +0200)]
Return the right content-type for the schema call

6 years agoExplicit error message
Dashie [Wed, 2 May 2018 20:45:20 +0000 (22:45 +0200)]
Explicit error message

6 years agoSimplify version and fix typo
Dashie [Wed, 2 May 2018 20:44:13 +0000 (22:44 +0200)]
Simplify version and fix typo

6 years agoAdd localPosts count, also set to 0 if null
Dashie [Wed, 2 May 2018 20:36:19 +0000 (22:36 +0200)]
Add localPosts count, also set to 0 if null

6 years agoChange path of nodeinfo to use .json format
Dashie [Wed, 2 May 2018 20:16:19 +0000 (22:16 +0200)]
Change path of nodeinfo to use .json format

6 years agoFormat files
Dashie [Wed, 2 May 2018 19:43:12 +0000 (21:43 +0200)]
Format files

6 years agoAdd first try at nodeinfo
Dashie [Wed, 2 May 2018 19:31:42 +0000 (21:31 +0200)]
Add first try at nodeinfo

6 years agoupdate frontend
lain [Sun, 29 Apr 2018 14:56:13 +0000 (16:56 +0200)]
update frontend

6 years agoFix format.
lain [Sun, 29 Apr 2018 09:28:26 +0000 (11:28 +0200)]
Fix format.

6 years agoMerge branch 'patch-bio' into 'develop'
lambda [Sun, 29 Apr 2018 09:26:47 +0000 (09:26 +0000)]
Merge branch 'patch-bio' into 'develop'

replace newlines in profiles with <br>

See merge request pleroma/pleroma!136

6 years agoActivityPub core: fix handling of unlisted statuses by leveraging a similar strategy...
William Pitcock [Sun, 29 Apr 2018 02:53:19 +0000 (02:53 +0000)]
ActivityPub core: fix handling of unlisted statuses by leveraging a similar strategy as for blocks

6 years agoInsert object after being rewritten.
lain [Sat, 28 Apr 2018 14:10:24 +0000 (16:10 +0200)]
Insert object after being rewritten.

6 years agoMerge branch 'fix/blocked-user-boosts' into 'develop'
lambda [Sat, 28 Apr 2018 13:49:12 +0000 (13:49 +0000)]
Merge branch 'fix/blocked-user-boosts' into 'develop'

ActivityPub.ex: do not return boosted statuses from blocked users.

See merge request pleroma/pleroma!111

6 years agoAdded a test (written by @andrewzah) for the MR
Wim Vanderbauwhede [Sat, 28 Apr 2018 11:01:43 +0000 (12:01 +0100)]
Added a test (written by @andrewzah) for the MR

6 years agoMerge remote-tracking branch 'upstream/develop' into patch-bio
Wim Vanderbauwhede [Sat, 28 Apr 2018 10:59:01 +0000 (11:59 +0100)]
Merge remote-tracking branch 'upstream/develop' into patch-bio

6 years agoMerge branch 'bugfix/mrf-simple-media-stripping' into 'develop'
lambda [Fri, 27 Apr 2018 05:49:12 +0000 (05:49 +0000)]
Merge branch 'bugfix/mrf-simple-media-stripping' into 'develop'

ActivityPub MRF SimplePolicy: fix media stripping

See merge request pleroma/pleroma!133

6 years agoMerge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop
lain [Thu, 26 Apr 2018 05:07:04 +0000 (07:07 +0200)]
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop

6 years agoResurrect instance specific panel.
lain [Thu, 26 Apr 2018 05:06:32 +0000 (07:06 +0200)]
Resurrect instance specific panel.

6 years agoActivityPub MRF SimplePolicy: fix media stripping
William Pitcock [Wed, 25 Apr 2018 21:25:56 +0000 (21:25 +0000)]
ActivityPub MRF SimplePolicy: fix media stripping

6 years agoMerge branch 'patch-1' into 'develop'
eal [Wed, 25 Apr 2018 14:35:44 +0000 (14:35 +0000)]
Merge branch 'patch-1' into 'develop'

Fix typo in MastoFE login page.

See merge request pleroma/pleroma!132

6 years agoOptionally deactivate public timelines.
lain [Wed, 25 Apr 2018 14:10:18 +0000 (16:10 +0200)]
Optionally deactivate public timelines.

6 years agoAlign local bio limits to remote limit.
lain [Wed, 25 Apr 2018 13:41:59 +0000 (15:41 +0200)]
Align local bio limits to remote limit.

6 years agoMerge branch 'feature/unrepeats' of git.pleroma.social:normandy/pleroma into feature...
Francis Dinh [Wed, 25 Apr 2018 05:58:50 +0000 (01:58 -0400)]
Merge branch 'feature/unrepeats' of git.pleroma.social:normandy/pleroma into feature/unrepeats

6 years agoFormatting fixes
Francis Dinh [Wed, 25 Apr 2018 05:43:45 +0000 (01:43 -0400)]
Formatting fixes