369581db6dShow a proper error. A failure doesn't always mean the command isn't available, and we check for it on startup
Mark Felder
2021-02-20 14:26:59 -06:00
4adb9e8e2cRevert these for now
Mark Felder
2021-02-20 14:25:11 -06:00
b23cf2d149Wrong name of binary
Mark Felder
2021-02-20 14:22:48 -06:00
14e52188afNo need to bump Mogrify at this time
Mark Felder
2021-02-20 14:21:39 -06:00
daba3b8522Change to using heic-convert which is more common than mogrify supporting these files
Mark Felder
2021-02-20 14:21:08 -06:00
a5f3d01d5aMerge branch 'neckbeard' of git.pleroma.social:sjw/pleroma into neckbeard
Your New SJW Waifu
2021-02-20 08:15:47 -06:00
2e35c076c2Merge remote-tracking branch 'upstream/develop' into neckbeard
Your New SJW Waifu
2021-02-20 08:15:18 -06:00
db7d6f337fAvoid unnecessary 500ms sleeps from CommonAPI.follow when the target user is remote
Mark Felder
2021-02-19 18:37:37 -06:00
26b620d676Permit :disclose_client in changesets
Mark Felder
2021-02-18 17:50:46 -06:00
63739c5a58Tests to validate client disclosure obeys user setting
Mark Felder
2021-02-18 17:23:17 -06:00
83301fe61aAdd field to user schema for controlling disclosure of client details
Mark Felder
2021-02-18 16:43:41 -06:00
d5ef02c7a7Mastodon makes this field null when posting with MastoFE or if you choose to not disclose it, so it's safe to be null by default
Mark Felder
2021-02-18 16:35:03 -06:00
b981edad8a[#3213] HashtagsTableMigrator: fault rate allowance to enable the feature (defaults to 1%), counting of affected objects, misc. tweaks.
Ivan Tashkinov
2021-02-18 20:40:10 +03:00
7da2a61a0bMerge remote-tracking branch 'upstream/develop' into neckbeard
Your New SJW Waifu
2021-02-16 13:23:49 -06:00
a511b0b203Merge branch 'neckbeard' of git.pleroma.social:sjw/pleroma into neckbeard
Your New SJW Waifu
2021-02-16 13:22:59 -06:00
9e0e2fb6b4Fix test name, credo
Mark Felder
2021-02-16 09:32:03 -06:00
28253c4e4aShould be private
Mark Felder
2021-02-16 09:27:40 -06:00
889341d0d7Validate we can convert heic to jpeg
Mark Felder
2021-02-16 09:14:40 -06:00
b40581c4e8Cleanup extra temp file
Mark Felder
2021-02-16 09:10:37 -06:00
13e324abe9Merge branch '2053-notifications-actor-is-active-refactoring' into 'develop'
rinpatch
2021-02-16 10:11:41 +00:00
f1f215cb38Relicense documentation under CC-BY-4.0
rinpatch
2021-02-16 13:08:08 +03:00
13b57f2cb3Add startup check to ensure we can convert the heic files
Mark Felder
2021-02-15 22:40:02 +00:00
d265c2c0f1Using the error now
Mark Felder
2021-02-15 21:32:48 +00:00
c6480eaf24Better error when using Mogrify
Mark Felder
2021-02-15 15:28:58 -06:00
390b4471f2Clearer assignment name
Mark Felder
2021-02-15 15:23:14 -06:00
d3cf505b42Oopsy
Mark Felder
2021-02-15 21:20:48 +00:00
8aff687053Rename to make it more obvious
Mark Felder
2021-02-15 21:16:21 +00:00
05c96187e6Work around inability to change format of files without an extension
Mark Felder
2021-02-15 21:01:04 +00:00
43bde2d4e7Update Mogrify to 0.8.0
Mark Felder
2021-02-15 20:59:20 +00:00
1dac7d1462[#3213] Fixed hashtags.name lookup (must use citext type to do index scan). Fixed embedded hashtags lookup (lowercasing), adjusted tests.
Ivan Tashkinov
2021-02-15 21:13:14 +03:00
8910303f71Merge branch 'chore/mailmap' into 'develop'
rinpatch
2021-02-15 10:30:29 +00:00
e2927d714eAdd myself to .mailmap
rinpatch
2021-02-15 13:19:44 +03:00
284504f689[#2053] Changed Notification/for_user_query/2 to use join to filter out inactive actors instead of subselect of _all_ inactive AP ids from users.
Ivan Tashkinov
2021-02-15 09:08:04 +03:00
47c719b6fdMerge branch 'neckbeard' of git.pleroma.social:sjw/pleroma into neckbeard
Your New SJW Waifu
2021-02-14 10:29:50 -06:00
d1a63f11a6Merge remote-tracking branch 'upstream/develop' into neckbeard
Your New SJW Waifu
2021-02-14 10:28:10 -06:00
349b8b0f4f[#3213] rescue around potentially-raising Repo.insert_all/_ calls. Misc. improvements (docs etc.).
Ivan Tashkinov
2021-02-13 22:01:11 +03:00
e531a0dd57Add filter for HEIF (.heic) files to convert them to JPEGs
Mark Felder
2021-02-12 17:48:26 -06:00
f2c5c763c3heic file also not supported well by ExifTool yet
Mark Felder
2021-02-12 17:48:06 -06:00
fb2a8e7ccdAdditional validation so we don't get caught off guard with a nil response if CommonAPI ever prevents us from injecting this data
Mark Felder
2021-02-12 13:15:33 -06:00
3554a65f45Inject fake application metadata and validate it is stripped by transmogrifier
Mark Felder
2021-02-12 13:05:12 -06:00
9b61df1fb6App is already preloaded into the token, so avoid an extra query
Mark Felder
2021-02-12 12:44:45 -06:00
db716f860aMerge branch 'not-used-mock' into 'develop'
rinpatch
2021-02-12 08:52:04 +00:00
76414ad277Merge branch 'bugfix/answer-outbox' into 'develop'
rinpatch
2021-02-12 08:48:51 +00:00
bd3d0e8b57Use a custom oauth token so we can predict and validate the client_name and website
Mark Felder
2021-02-11 15:53:10 -06:00
4b979538bcDocument the application metadata is now retained as part of the post.
Mark Felder
2021-02-11 15:10:53 -06:00
333ff527fdValidate client application metadata is retained in the object
Mark Felder
2021-02-11 15:07:21 -06:00
c1d78328eeConsistency
Mark Felder
2021-02-11 14:27:52 -06:00
6dc0b13cf8Revert to original formatting for these function defs
Mark Felder
2021-02-11 14:22:58 -06:00
7c508319a5Prefer naming this put_application because we're putting it into the params map
Mark Felder
2021-02-11 14:19:53 -06:00
09b8378646%Token{} may not be in the conn, so avoid breaking the ability to post statuses in that scenario.
Mark Felder
2021-02-11 14:15:25 -06:00
5992382cf8Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
Ivan Tashkinov
2021-02-11 19:31:57 +03:00