akkoma
3 years agoMerge branch 'oauth-token-30-days-expiration' into 'develop'
feld [Wed, 9 Dec 2020 17:10:09 +0000 (17:10 +0000)]
Merge branch 'oauth-token-30-days-expiration' into 'develop'

Changed default OAuth token expiration time to 30 days

See merge request pleroma/pleroma!3192

3 years agoChanged default OAuth token expiration time to 30 days.
Ivan Tashkinov [Wed, 9 Dec 2020 16:59:46 +0000 (19:59 +0300)]
Changed default OAuth token expiration time to 30 days.

3 years agoMerge branch 'auth-improvements' into 'develop'
lain [Wed, 9 Dec 2020 15:55:45 +0000 (15:55 +0000)]
Merge branch 'auth-improvements' into 'develop'

Cookie auth rework / Auth subsystem refactoring and tweaks

Closes pleroma/secteam/pleroma#3

See merge request pleroma/pleroma!3112

3 years agoMerge branch 'stream-follow-updates' into 'develop'
lain [Wed, 9 Dec 2020 15:52:31 +0000 (15:52 +0000)]
Merge branch 'stream-follow-updates' into 'develop'

Stream follow updates

Closes #2299

See merge request pleroma/pleroma!3183

3 years ago[#3112] .gitattributes fix.
Ivan Tashkinov [Wed, 9 Dec 2020 15:43:20 +0000 (18:43 +0300)]
[#3112] .gitattributes fix.

3 years agoUpdate CHANGELOG
Egor Kislitsyn [Wed, 9 Dec 2020 15:40:40 +0000 (19:40 +0400)]
Update CHANGELOG

3 years agoMerge branch 'feat/warn-large-pool-size' into 'develop'
lain [Tue, 8 Dec 2020 16:36:51 +0000 (16:36 +0000)]
Merge branch 'feat/warn-large-pool-size' into 'develop'

Add a startup error for modified Repo pool_size

See merge request pleroma/pleroma!3190

3 years agoApplicationRequirements: Add test, more text for pool size.
lain [Tue, 8 Dec 2020 16:30:10 +0000 (17:30 +0100)]
ApplicationRequirements: Add test, more text for pool size.

3 years agoApply 1 suggestion(s) to 1 file(s)
lain [Tue, 8 Dec 2020 16:16:43 +0000 (16:16 +0000)]
Apply 1 suggestion(s) to 1 file(s)

3 years agoMerge branch 'features/favicon-unreachable-instance' into 'develop'
feld [Mon, 7 Dec 2020 22:49:45 +0000 (22:49 +0000)]
Merge branch 'features/favicon-unreachable-instance' into 'develop'

instance: Do not fetch unreachable instances

Closes #2346

See merge request pleroma/pleroma!3189

3 years agoAdd a startup error for modified Repo pool_size
Mark Felder [Mon, 7 Dec 2020 22:36:44 +0000 (16:36 -0600)]
Add a startup error for modified Repo pool_size

3 years agoinstance.reachable?: Limit to binary input
Haelwenn (lanodan) Monnier [Mon, 7 Dec 2020 20:18:51 +0000 (21:18 +0100)]
instance.reachable?: Limit to binary input

3 years agoinstance: Do not fetch unreachable instances
Haelwenn (lanodan) Monnier [Mon, 7 Dec 2020 19:09:34 +0000 (20:09 +0100)]
instance: Do not fetch unreachable instances

Closes: https://git.pleroma.social/pleroma/pleroma/-/issues/2346
3 years ago[#3112] Changelog entry.
Ivan Tashkinov [Mon, 7 Dec 2020 18:50:32 +0000 (21:50 +0300)]
[#3112] Changelog entry.

3 years agoMerge remote-tracking branch 'remotes/origin/develop' into auth-improvements
Ivan Tashkinov [Mon, 7 Dec 2020 18:45:04 +0000 (21:45 +0300)]
Merge remote-tracking branch 'remotes/origin/develop' into auth-improvements

# Conflicts:
# CHANGELOG.md

3 years agoMerge branch 'feature/configdb-mix-tasks' into 'develop'
lain [Mon, 7 Dec 2020 18:06:06 +0000 (18:06 +0000)]
Merge branch 'feature/configdb-mix-tasks' into 'develop'

Add mix tasks to give additional ConfigDB recovery and debugging options

See merge request pleroma/pleroma!3174

3 years agoPrint out settings that will be removed when specifying the group and key for consistency
Mark Felder [Mon, 7 Dec 2020 17:45:56 +0000 (11:45 -0600)]
Print out settings that will be removed when specifying the group and key for consistency

Fix error message when specified key doesn't exist

3 years agoFormatting
Mark Felder [Mon, 7 Dec 2020 17:22:07 +0000 (11:22 -0600)]
Formatting

3 years agoSlip in a test to ensure we can use the atom syntax in mix task arguments
Mark Felder [Mon, 7 Dec 2020 17:21:06 +0000 (11:21 -0600)]
Slip in a test to ensure we can use the atom syntax in mix task arguments

3 years agoApply 1 suggestion(s) to 1 file(s)
feld [Mon, 7 Dec 2020 17:13:29 +0000 (17:13 +0000)]
Apply 1 suggestion(s) to 1 file(s)

3 years agoMerge branch 'feature/configdb-mix-tasks-refactoring' into 'feature/configdb-mix...
feld [Mon, 7 Dec 2020 17:12:47 +0000 (17:12 +0000)]
Merge branch 'feature/configdb-mix-tasks-refactoring' into 'feature/configdb-mix-tasks'

[#3174] Refactoring: ConfigDB fetching functions, ConfigDB tests.

See merge request pleroma/pleroma!3187

3 years ago[#3174] Refactoring: ConfigDB fetching functions, ConfigDB tests.
Ivan Tashkinov [Sun, 6 Dec 2020 15:02:30 +0000 (18:02 +0300)]
[#3174] Refactoring: ConfigDB fetching functions, ConfigDB tests.
Minor fixes.

3 years agoMerge remote-tracking branch 'remotes/origin/develop' into auth-improvements
Ivan Tashkinov [Sun, 6 Dec 2020 10:59:35 +0000 (13:59 +0300)]
Merge remote-tracking branch 'remotes/origin/develop' into auth-improvements

3 years ago[#3112] Ensured presence and consistency of :user and :token assigns (EnsureUserToken...
Ivan Tashkinov [Sun, 6 Dec 2020 10:59:10 +0000 (13:59 +0300)]
[#3112] Ensured presence and consistency of :user and :token assigns (EnsureUserTokenAssignsPlug). Refactored auth info dropping functions.

3 years agoFix typo
Egor Kislitsyn [Sat, 5 Dec 2020 19:48:13 +0000 (23:48 +0400)]
Fix typo

3 years agoAdd entry announcing new ConfigDB mix tasks
Mark Felder [Sat, 5 Dec 2020 14:41:15 +0000 (08:41 -0600)]
Add entry announcing new ConfigDB mix tasks

3 years agoMerge branch 'fix/mix-task-yn-prompt' into 'develop'
feld [Fri, 4 Dec 2020 18:17:35 +0000 (18:17 +0000)]
Merge branch 'fix/mix-task-yn-prompt' into 'develop'

Remove Mix.Pleroma.shell_yes?/1

See merge request pleroma/pleroma!3179

3 years agoAnswer new prompt interactively
Mark Felder [Fri, 4 Dec 2020 18:07:23 +0000 (12:07 -0600)]
Answer new prompt interactively

3 years agoshell_yes?/1 was not showing the correct message and always defaults to yes which...
Mark Felder [Fri, 27 Nov 2020 19:42:28 +0000 (13:42 -0600)]
shell_yes?/1 was not showing the correct message and always defaults to yes which is dangerous

3 years agoMerge branch 'issue/2256' into 'develop'
feld [Fri, 4 Dec 2020 17:49:05 +0000 (17:49 +0000)]
Merge branch 'issue/2256' into 'develop'

[#2256] added subject actor to moderation log

See merge request pleroma/pleroma!3164

3 years agoMore compact representation
Mark Felder [Fri, 4 Dec 2020 17:37:49 +0000 (11:37 -0600)]
More compact representation

3 years agoEnsure deleting entire group prints out settings that will be removed before actually...
Mark Felder [Fri, 4 Dec 2020 17:30:48 +0000 (11:30 -0600)]
Ensure deleting entire group prints out settings that will be removed before actually removing them

3 years agoFix deleting an entire group. Also utilize Pleroma.ConfigDB.delete/1
Mark Felder [Fri, 4 Dec 2020 17:19:58 +0000 (11:19 -0600)]
Fix deleting an entire group. Also utilize Pleroma.ConfigDB.delete/1

3 years agoUse Pleroma.ConfigDB.delete/1 instead of rolling our own
Mark Felder [Fri, 4 Dec 2020 17:09:13 +0000 (11:09 -0600)]
Use Pleroma.ConfigDB.delete/1 instead of rolling our own

3 years agoUse Enum.any? to ensure we return true if there are results
Mark Felder [Fri, 4 Dec 2020 17:04:53 +0000 (11:04 -0600)]
Use Enum.any? to ensure we return true if there are results

3 years agoMerge branch 'supported-emojos' into 'develop'
rinpatch [Thu, 3 Dec 2020 18:29:42 +0000 (18:29 +0000)]
Merge branch 'supported-emojos' into 'develop'

Update Emoji support to unicode 13.1, support all RGI emoji.

See merge request pleroma/pleroma!3186

3 years agoconfig_db search methods
Alexander Strizhakov [Thu, 3 Dec 2020 16:34:23 +0000 (19:34 +0300)]
config_db search methods

3 years agodump_key/2 no longer used
Mark Felder [Thu, 3 Dec 2020 16:03:44 +0000 (10:03 -0600)]
dump_key/2 no longer used

3 years agoApply 6 suggestion(s) to 1 file(s)
feld [Thu, 3 Dec 2020 16:03:14 +0000 (16:03 +0000)]
Apply 6 suggestion(s) to 1 file(s)

3 years agoCredo
Mark Felder [Thu, 3 Dec 2020 15:58:24 +0000 (09:58 -0600)]
Credo

3 years agoDocs, Changelog: Add info about regional indicators
lain [Thu, 3 Dec 2020 15:18:35 +0000 (16:18 +0100)]
Docs, Changelog: Add info about regional indicators

3 years agoEmoji: Also accept regional indicators
lain [Thu, 3 Dec 2020 15:17:39 +0000 (16:17 +0100)]
Emoji: Also accept regional indicators

3 years agoMerge branch '2339-local-remote-mixup' into 'develop'
Haelwenn [Thu, 3 Dec 2020 01:28:54 +0000 (01:28 +0000)]
Merge branch '2339-local-remote-mixup' into 'develop'

User: Don't allow local users in remote changesets

Closes #2339

See merge request pleroma/pleroma!3185

3 years agoMerge branch 'update-linkify' into 'develop'
feld [Wed, 2 Dec 2020 22:40:13 +0000 (22:40 +0000)]
Merge branch 'update-linkify' into 'develop'

Update Linkify to 0.4.0

See merge request pleroma/pleroma!3184

3 years agoMake the --force flag for reset command consistent with the others and deduplicate...
Mark Felder [Wed, 2 Dec 2020 22:34:23 +0000 (16:34 -0600)]
Make the --force flag for reset command consistent with the others and deduplicate db truncation

3 years agoAdd --force flag for delete and reset commands
Mark Felder [Wed, 2 Dec 2020 22:24:32 +0000 (16:24 -0600)]
Add --force flag for delete and reset commands

Bunch of reorganization and consolidation

3 years agoAdd comment for this mysterious behavior
Mark Felder [Wed, 2 Dec 2020 20:22:59 +0000 (14:22 -0600)]
Add comment for this mysterious behavior

3 years agoNo need for a separate functions here
Mark Felder [Wed, 2 Dec 2020 19:00:07 +0000 (13:00 -0600)]
No need for a separate functions here

3 years agoUse a callback strategy to short circuit the functions and print a nice error
Mark Felder [Wed, 2 Dec 2020 18:33:34 +0000 (12:33 -0600)]
Use a callback strategy to short circuit the functions and print a nice error

3 years agoCentralize check that configdb is enabled which now raises an exception
Mark Felder [Sun, 29 Nov 2020 19:29:36 +0000 (13:29 -0600)]
Centralize check that configdb is enabled which now raises an exception

3 years agoLeft public during debugging
Mark Felder [Sun, 29 Nov 2020 18:59:03 +0000 (12:59 -0600)]
Left public during debugging

3 years agoAdd tests for config dumping
Mark Felder [Sat, 28 Nov 2020 19:32:28 +0000 (13:32 -0600)]
Add tests for config dumping

3 years agoUse inspect instead of faking the output
Mark Felder [Sat, 28 Nov 2020 18:24:37 +0000 (12:24 -0600)]
Use inspect instead of faking the output

3 years agoRemove unnecessary keys command
Mark Felder [Sat, 28 Nov 2020 18:22:30 +0000 (12:22 -0600)]
Remove unnecessary keys command

3 years agoSync docs with mix commands
Mark Felder [Sat, 28 Nov 2020 18:19:00 +0000 (12:19 -0600)]
Sync docs with mix commands

3 years agoThe debug output is no longer there by default
Mark Felder [Sat, 28 Nov 2020 18:09:17 +0000 (12:09 -0600)]
The debug output is no longer there by default

3 years agoEnsure scary warning starts on a new line
Mark Felder [Sat, 28 Nov 2020 18:05:01 +0000 (12:05 -0600)]
Ensure scary warning starts on a new line

3 years agoUpdate ConfigDB docs for new mix commands
Mark Felder [Sat, 28 Nov 2020 17:53:45 +0000 (11:53 -0600)]
Update ConfigDB docs for new mix commands

3 years agoPrint whole config when resetting and include a scary looking message.
Mark Felder [Fri, 27 Nov 2020 22:32:46 +0000 (16:32 -0600)]
Print whole config when resetting and include a scary looking message.

3 years agoBoth are really atoms
Mark Felder [Fri, 27 Nov 2020 22:32:32 +0000 (16:32 -0600)]
Both are really atoms

3 years agoTransform strings to atoms for all cases, including when the atom is a module like...
Mark Felder [Fri, 27 Nov 2020 22:20:28 +0000 (16:20 -0600)]
Transform strings to atoms for all cases, including when the atom is a module like Pleroma.Emails.Mailer

3 years agoSupport atoms and strings as args to the mix task
Mark Felder [Fri, 27 Nov 2020 20:44:05 +0000 (14:44 -0600)]
Support atoms and strings as args to the mix task

Improve output. Show the user what will be deleted before the prompt.

3 years agoFix deletion regression due to strings instead of atoms
Mark Felder [Fri, 27 Nov 2020 20:02:45 +0000 (14:02 -0600)]
Fix deletion regression due to strings instead of atoms
Improve message after successful deletion

3 years agoImprove dumping groups and specific keys; add prompts for delete and reset
Mark Felder [Fri, 27 Nov 2020 19:55:43 +0000 (13:55 -0600)]
Improve dumping groups and specific keys; add prompts for delete and reset

3 years agoSupport listing groups, listing keys in a group, and dumping the config based on...
Mark Felder [Fri, 27 Nov 2020 18:33:55 +0000 (12:33 -0600)]
Support listing groups, listing keys in a group, and dumping the config based on group or specific key in that group

3 years agoSort output by group
Mark Felder [Fri, 27 Nov 2020 18:32:53 +0000 (12:32 -0600)]
Sort output by group

Not the best sorting, but better than nothing.

3 years agoAdd the delete and reset instructions
Mark Felder [Wed, 25 Nov 2020 23:51:31 +0000 (17:51 -0600)]
Add the delete and reset instructions

3 years agoRename keys to groups
Mark Felder [Wed, 25 Nov 2020 23:49:36 +0000 (17:49 -0600)]
Rename keys to groups

3 years agoSpelling
Mark Felder [Wed, 25 Nov 2020 23:46:57 +0000 (17:46 -0600)]
Spelling

3 years agoDocument how to delete individual configuration groups and completely reset the confi...
Mark Felder [Wed, 25 Nov 2020 23:31:44 +0000 (17:31 -0600)]
Document how to delete individual configuration groups and completely reset the config without SQL

3 years agoBetter deletion message
Mark Felder [Wed, 25 Nov 2020 23:16:23 +0000 (17:16 -0600)]
Better deletion message

3 years agoAdd mix tasks to give additional recovery and debugging options
Mark Felder [Wed, 25 Nov 2020 18:44:06 +0000 (12:44 -0600)]
Add mix tasks to give additional recovery and debugging options

- pleroma.config dump: prints the entire config as it would be exported to the filesystem
- pleroma.config dump KEY: prints the configuration under a specific ConfigDB key in the database
- pleroma.config keylist: lists the available keys in ConfigDB
- pleroma.config keydel KEY: deletes ConfigDB entry stored under the key

This should prevent the need for users to manually execute SQL queries.

3 years agoWe no longer expect mentions to link if they are prefixed with too many @'s
Mark Felder [Wed, 2 Dec 2020 16:27:55 +0000 (10:27 -0600)]
We no longer expect mentions to link if they are prefixed with too many @'s

3 years agoChangelog: Update changelog
lain [Wed, 2 Dec 2020 15:52:44 +0000 (16:52 +0100)]
Changelog: Update changelog

3 years agoDocs: Add info about RGI emoji
lain [Wed, 2 Dec 2020 15:49:38 +0000 (16:49 +0100)]
Docs: Add info about RGI emoji

3 years agoEmoji: Only accept RGI emoji.
lain [Wed, 2 Dec 2020 15:46:19 +0000 (16:46 +0100)]
Emoji: Only accept RGI emoji.

"recommended for general interchange"

3 years agoEmoji: Add test for ZWJ sequence emoji
lain [Wed, 2 Dec 2020 15:18:08 +0000 (16:18 +0100)]
Emoji: Add test for ZWJ sequence emoji

3 years agoDocument follow relationship updates and cleanup
Egor Kislitsyn [Wed, 2 Dec 2020 15:16:36 +0000 (19:16 +0400)]
Document follow relationship updates and cleanup

3 years agoEmoji: Remove unused emoji-data.txt
lain [Wed, 2 Dec 2020 15:15:31 +0000 (16:15 +0100)]
Emoji: Remove unused emoji-data.txt

3 years agoEmoji: Update to Unicode 13.1, switch base file, allow multichar.
lain [Wed, 2 Dec 2020 15:15:03 +0000 (16:15 +0100)]
Emoji: Update to Unicode 13.1, switch base file, allow multichar.

3 years agoSideEffects: fix test
lain [Wed, 2 Dec 2020 13:48:11 +0000 (14:48 +0100)]
SideEffects: fix test

3 years agoUser: Remove left-over (wrong) fix.
lain [Wed, 2 Dec 2020 12:39:29 +0000 (13:39 +0100)]
User: Remove left-over (wrong) fix.

3 years agoUser: Don't allow local users in remote changesets
lain [Wed, 2 Dec 2020 11:18:43 +0000 (12:18 +0100)]
User: Don't allow local users in remote changesets

3 years agoUpdate Linkify to 0.4.0
Mark Felder [Tue, 1 Dec 2020 23:26:25 +0000 (17:26 -0600)]
Update Linkify to 0.4.0

3 years agoStream follow updates
Egor Kislitsyn [Tue, 1 Dec 2020 20:17:52 +0000 (00:17 +0400)]
Stream follow updates

3 years agoMerge branch 'fix/search-test-on-exit' into 'develop'
rinpatch [Tue, 1 Dec 2020 17:08:05 +0000 (17:08 +0000)]
Merge branch 'fix/search-test-on-exit' into 'develop'

Search tests: Use on_exit for restoring `persistent_term` state

See merge request pleroma/pleroma!3182

3 years agoSearch tests: Use on_exit for restoring `persistent_term` state
rinpatch [Tue, 1 Dec 2020 16:45:25 +0000 (19:45 +0300)]
Search tests: Use on_exit for restoring `persistent_term` state

Otherwise if the assertion failed, the code below which resets the
state would never be reached

3 years ago[#3112] Allowed revoking same-user token from any apps. Added tests.
Ivan Tashkinov [Mon, 30 Nov 2020 18:55:48 +0000 (21:55 +0300)]
[#3112] Allowed revoking same-user token from any apps. Added tests.

3 years agoMerge remote-tracking branch 'remotes/origin/develop' into auth-improvements
Ivan Tashkinov [Sat, 28 Nov 2020 18:51:27 +0000 (21:51 +0300)]
Merge remote-tracking branch 'remotes/origin/develop' into auth-improvements

3 years agoOAuth form user remembering feature. Local MastoFE login / logout fixes.
Ivan Tashkinov [Sat, 28 Nov 2020 18:51:06 +0000 (21:51 +0300)]
OAuth form user remembering feature. Local MastoFE login / logout fixes.

3 years agoMerge branch '2727-gitlab-issues' into 'develop'
Haelwenn [Fri, 27 Nov 2020 14:20:59 +0000 (14:20 +0000)]
Merge branch '2727-gitlab-issues' into 'develop'

Gitlab-CI: Explicitly tag specified arm32 images.

Closes #2327

See merge request pleroma/pleroma!3178

3 years agoGitlab-CI: Explicitly tag specified arm32 images.
lain [Fri, 27 Nov 2020 12:27:35 +0000 (13:27 +0100)]
Gitlab-CI: Explicitly tag specified arm32 images.

So we don't accidentally run generic images on runners
that only can deal with specific images.

3 years agoMerge branch 'fix/2322-digest-algorithm-case-insensitive' into 'develop'
lain [Fri, 27 Nov 2020 11:51:24 +0000 (11:51 +0000)]
Merge branch 'fix/2322-digest-algorithm-case-insensitive' into 'develop'

Digest algorithm is taken from header

Closes #2322

See merge request pleroma/pleroma!3176

3 years agodigest algorithm is taken from header
Alexander Strizhakov [Thu, 26 Nov 2020 08:12:44 +0000 (11:12 +0300)]
digest algorithm is taken from header

3 years agoMerge branch 'removing-fed-sockets-settings' into 'develop'
rinpatch [Thu, 26 Nov 2020 15:35:22 +0000 (15:35 +0000)]
Merge branch 'removing-fed-sockets-settings' into 'develop'

Removing remaining fed sockets settings

See merge request pleroma/pleroma!3177

3 years agoremoving fed sockets settings
Alexander Strizhakov [Thu, 26 Nov 2020 14:39:38 +0000 (17:39 +0300)]
removing fed sockets settings

3 years agoMerge branch 'fix/mix-debug' into 'develop'
feld [Wed, 25 Nov 2020 23:59:52 +0000 (23:59 +0000)]
Merge branch 'fix/mix-debug' into 'develop'

Prevent mix tasks from spewing any internal logging unless DEBUG is in the env

See merge request pleroma/pleroma!3175

3 years agofix spec
Maksim Pechnikov [Wed, 25 Nov 2020 13:44:11 +0000 (16:44 +0300)]
fix spec

3 years agoPrevent mix tasks from spewing any internal logging unless DEBUG is in the env
Mark Felder [Wed, 25 Nov 2020 18:52:39 +0000 (12:52 -0600)]
Prevent mix tasks from spewing any internal logging unless DEBUG is in the env

e.g., DEBUG=1 mix pleroma.config migrate_from_db

3 years agoMerge remote-tracking branch 'remotes/origin/develop' into auth-improvements
Ivan Tashkinov [Wed, 25 Nov 2020 18:48:18 +0000 (21:48 +0300)]
Merge remote-tracking branch 'remotes/origin/develop' into auth-improvements