From 38ced2369582ad50535330109cdf6aab4ffe27ab Mon Sep 17 00:00:00 2001 From: "Filip H.F. \"FiXato\" Slagter" Date: Fri, 18 Oct 2019 13:34:39 +0200 Subject: [PATCH 1/4] switched contributor-covenant.org links to https Since the website of contributor-covenant is served over https, I changed the links to use httpS rather than http to prevent the needless redirect. --- CODE_OF_CONDUCT.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index f6c32d70c..9c69e7984 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -40,7 +40,7 @@ Project maintainers who do not follow or enforce the Code of Conduct in good fai ## Attribution -This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, available at [http://contributor-covenant.org/version/1/4][version] +This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, available at [https://contributor-covenant.org/version/1/4][version] -[homepage]: http://contributor-covenant.org -[version]: http://contributor-covenant.org/version/1/4/ +[homepage]: https://contributor-covenant.org +[version]: https://contributor-covenant.org/version/1/4/ From 8560c296e451aa666a14b9901a891cb73b4eb9e9 Mon Sep 17 00:00:00 2001 From: "Filip H.F. \"FiXato\" Slagter" Date: Fri, 18 Oct 2019 13:45:02 +0200 Subject: [PATCH 2/4] Changed contact address Since the CoC mentions you can contact the *team* for reports, it's probably a good idea to use the pixelfed contact e-mail address, rather than (what I assume is) Daniel's own address. I'm not sure if the project's team currently consists of more people than just Daniel, but if so, this address should be accessible by all members of the team. --- CODE_OF_CONDUCT.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index f6c32d70c..68c9ad37a 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -34,7 +34,7 @@ This Code of Conduct applies both within project spaces and in public spaces whe ## Enforcement -Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at danielsupernault@gmail.com. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately. +Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at hello@pixelfed.org. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately. Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership. From 771f9c461558e2e4a2a5a854648982699918bece Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Fri, 18 Oct 2019 13:40:56 -0600 Subject: [PATCH 3/4] Update FixLikes command, fix postgres support --- app/Console/Commands/FixLikes.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Console/Commands/FixLikes.php b/app/Console/Commands/FixLikes.php index adb4ee454..0209f66b0 100644 --- a/app/Console/Commands/FixLikes.php +++ b/app/Console/Commands/FixLikes.php @@ -40,7 +40,7 @@ class FixLikes extends Command public function handle() { $chunk = 100; - $limit = Like::groupBy('status_id')->get()->count(); + $limit = Like::select('status_id')->groupBy('status_id')->get()->count(); if($limit > 1000) { if($this->confirm('We have found more than 1000 records to update, this may take a few moments. Are you sure you want to continue?') == false) { @@ -56,7 +56,7 @@ class FixLikes extends Command $bar->start(); Like::selectRaw('count(id) as count, status_id') - ->groupBy('status_id') + ->groupBy(['status_id','id']) ->chunk($chunk, function($likes) use($bar) { foreach($likes as $like) { $s = Status::find($like['status_id']); From 09e406ec2d3db82d17e3665ef6b93ad3c6e6deb1 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Fri, 18 Oct 2019 13:41:42 -0600 Subject: [PATCH 4/4] Update changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index ed9a8458e..77f5b7c1b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -36,6 +36,7 @@ - Updated BaseApiController, uncache verify_credentials method ([3fa9ac8b](https://github.com/pixelfed/pixelfed/commit/3fa9ac8b)) - Updated StatusHashtagService, reduce cached hashtag count ttl from 6 hours to 5 minutes ([126886e8](https://github.com/pixelfed/pixelfed/commit/126886e8)) - Updated Hashtag.vue component, added formatted posts count ([c71f3dd1](https://github.com/pixelfed/pixelfed/commit/c71f3dd1)) +- Updated FixLikes command, fix postgres support ([771f9c46](https://github.com/pixelfed/pixelfed/commit/771f9c46)) ## Deprecated