From 927ef3b057f809fe8d48ed000e60402efb93adef Mon Sep 17 00:00:00 2001 From: Alexandra Dunn Date: Wed, 27 Jan 2021 11:44:14 -0800 Subject: [PATCH 01/13] docker-compose: store default db passwords in .env.docker and have redis use a password as well --- .env.docker | 13 +++++++++---- docker-compose.yml | 25 +++++++++++-------------- 2 files changed, 20 insertions(+), 18 deletions(-) diff --git a/.env.docker b/.env.docker index 63b7fc5c5..f9291c570 100644 --- a/.env.docker +++ b/.env.docker @@ -56,11 +56,16 @@ MAIL_ENCRYPTION=null ## Databases (MySQL) DB_CONNECTION=mysql -DB_HOST=127.0.0.1 +DB_DATABASE=pixelfed_prod +DB_HOST=db +DB_PASSWORD=pixelfed_db_pass DB_PORT=3306 -DB_DATABASE=pixelfed DB_USERNAME=pixelfed -DB_PASSWORD=pixelfed +# pass the same values to the db itself +MYSQL_DATABASE=pixelfed_prod +MYSQL_PASSWORD=pixelfed_db_pass +MYSQL_RANDOM_ROOT_PASSWORD=true +MYSQL_USER=pixelfed ## Databases (Postgres) #DB_CONNECTION=pgsql @@ -74,7 +79,7 @@ DB_PASSWORD=pixelfed REDIS_CLIENT=phpredis REDIS_SCHEME=tcp REDIS_HOST=redis -REDIS_PASSWORD=null +REDIS_PASSWORD=redis_password REDIS_PORT=6379 REDIS_DATABASE=0 diff --git a/docker-compose.yml b/docker-compose.yml index 772fd7c2f..57b2a6d33 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -11,7 +11,6 @@ version: '3' # if the volumes are properly shared between cluster members. services: - ## App and Worker app: # Comment to use dockerhub image @@ -21,16 +20,15 @@ services: image: pixelfed restart: unless-stopped env_file: - - ./.env.docker + - .env.docker volumes: - - "app-storage:/var/www/storage" - - "app-bootstrap:/var/www/bootstrap" - - "./.env.docker:/var/www/.env" + - app-storage:/var/www/storage + - app-bootstrap:/var/www/bootstrap networks: - external - internal ports: - - "8080:80" + - "8080:80" depends_on: - db - redis @@ -42,10 +40,10 @@ services: image: pixelfed restart: unless-stopped env_file: - - ./.env.docker + - .env.docker volumes: - - "app-storage:/var/www/storage" - - "app-bootstrap:/var/www/bootstrap" + - app-storage:/var/www/storage + - app-bootstrap:/var/www/bootstrap networks: - external - internal @@ -61,17 +59,16 @@ services: networks: - internal command: --default-authentication-plugin=mysql_native_password - environment: - - MYSQL_DATABASE=pixelfed - - MYSQL_USER=${DB_USERNAME} - - MYSQL_PASSWORD=${DB_PASSWORD} - - MYSQL_RANDOM_ROOT_PASSWORD=true + env_file: + - .env.docker volumes: - "db-data:/var/lib/mysql" redis: image: redis:5-alpine restart: unless-stopped + env_file: + - .env.docker volumes: - "redis-data:/data" networks: From 7e7d2e60ddd18837f8ce20fd55ef325fb1009857 Mon Sep 17 00:00:00 2001 From: Sasi Olin Date: Mon, 22 Feb 2021 22:18:05 +0100 Subject: [PATCH 02/13] Fix label describing the wrong field in settings --- resources/views/settings/home.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/settings/home.blade.php b/resources/views/settings/home.blade.php index 15a5ac71f..b55eaff16 100644 --- a/resources/views/settings/home.blade.php +++ b/resources/views/settings/home.blade.php @@ -58,7 +58,7 @@
- +
@@ -741,9 +741,9 @@ body-class="p-2 rounded">
- @@ -764,7 +764,7 @@
- + @@ -781,14 +781,14 @@ size="xl" body-class="list-group-flush p-0 m-0 rounded"> @@ -934,7 +934,7 @@ let el = document.querySelector('link[data-stylesheet="light"]'); el.setAttribute('href', '/css/appdark.css?id=' + Date.now()); - el.setAttribute('data-stylesheet', 'dark'); + el.setAttribute('data-stylesheet', 'dark'); }*/ if(localStorage.getItem('pf_metro_ui.exp.rec') == 'false') { @@ -1019,14 +1019,14 @@ $('.timeline .pagination').removeClass('d-none'); // if(this.feed.length == 4) { // this.fetchTimelineApi(); - // } + // } if(this.hashtagPosts.length == 0) { this.fetchHashtagPosts(); } // this.fetchStories(); this.rtw(); setTimeout(function() { - document.querySelectorAll('.timeline .card-body .comments .comment-body a').forEach(function(i, e) { + document.querySelectorAll('.timeline .card-body .comments .comment-body a').forEach(function(i, e) { i.href = App.util.format.rewriteLinks(i); }); }, 500); @@ -1079,7 +1079,7 @@ 'status_id': d.id, 'profile_id': d.account.id }); - } + } }); this.min_id = Math.max(...this.ids).toString(); this.max_id = Math.min(...this.ids).toString(); @@ -1211,7 +1211,7 @@ }, fetchStatusComments(status, card) { - // axios.get('/api/v2/status/'+status.id+'/replies', + // axios.get('/api/v2/status/'+status.id+'/replies', // { // params: { // limit: 6 @@ -1223,7 +1223,7 @@ // }); // this.replies = _.reverse(data); // setTimeout(function() { - // document.querySelectorAll('.timeline .card-body .comments .comment-body a').forEach(function(i, e) { + // document.querySelectorAll('.timeline .card-body .comments .comment-body a').forEach(function(i, e) { // i.href = App.util.format.rewriteLinks(i); // }); // }, 500); @@ -1233,7 +1233,7 @@ axios.get(url) .then(response => { let self = this; - // this.results = this.layout == 'metro' ? + // this.results = this.layout == 'metro' ? // _.reverse(response.data.data) : // response.data.data; this.replies = _.reverse(response.data.data); @@ -1244,7 +1244,7 @@ $('.postCommentsLoader').addClass('d-none'); $('.postCommentsContainer').removeClass('d-none'); // setTimeout(function() { - // document.querySelectorAll('.status-comment .postCommentsContainer .comment-body a').forEach(function(i, e) { + // document.querySelectorAll('.status-comment .postCommentsContainer .comment-body a').forEach(function(i, e) { // i.href = App.util.format.rewriteLinks(i); // }); // }, 500); @@ -1622,7 +1622,7 @@ this.replyText += em + ' '; $('textarea[name="comment"]').focus(); } - }, + }, refreshSuggestions() { return; @@ -1794,7 +1794,7 @@ this.$refs.ctxModModal.hide(); this.$refs.ctxModOtherModal.show(); }, - + ctxModMenu() { this.$refs.ctxModal.hide(); }, @@ -1854,7 +1854,7 @@ return usr + ' ' + txt + ' ' + dom + ''; break; - default: + default: return usr + '@' + dom + ''; break; } @@ -2104,7 +2104,7 @@ if(this.status.comments_disabled) { return; } - + this.replyToIndex = index; this.replyingToId = e.id; this.replyingToUsername = e.account.username; @@ -2184,9 +2184,9 @@ color: #3897f0; } .replyModalTextarea { - border: none; - font-size: 18px; - resize: none; + border: none; + font-size: 18px; + resize: none; white-space: pre-wrap; outline: none; } diff --git a/resources/assets/js/components/presenter/PhotoAlbumPresenter.vue b/resources/assets/js/components/presenter/PhotoAlbumPresenter.vue index 93c481bf6..858cf864c 100644 --- a/resources/assets/js/components/presenter/PhotoAlbumPresenter.vue +++ b/resources/assets/js/components/presenter/PhotoAlbumPresenter.vue @@ -8,6 +8,20 @@ +

Photo by @{{status.account.username}} licensed under {{status.media_attachments[0].license.title}}

 @@ -16,6 +30,20 @@ +

Photo by @{{status.account.username}} licensed under {{status.media_attachments[0].license.title}}
@@ -83,4 +111,4 @@ } } } - \ No newline at end of file + diff --git a/resources/assets/js/components/presenter/PhotoPresenter.vue b/resources/assets/js/components/presenter/PhotoPresenter.vue index d350c7aea..4dd1f2626 100644 --- a/resources/assets/js/components/presenter/PhotoPresenter.vue +++ b/resources/assets/js/components/presenter/PhotoPresenter.vue @@ -23,27 +23,27 @@
- -

Photo by @{{status.account.username}} licensed under {{status.media_attachments[0].license.title}}

@@ -91,7 +91,7 @@ }, width() { - if( !this.status.media_attachments[0].meta || + if( !this.status.media_attachments[0].meta || !this.status.media_attachments[0].meta.original || !this.status.media_attachments[0].meta.original.width ) { return; @@ -100,7 +100,7 @@ }, height() { - if( !this.status.media_attachments[0].meta || + if( !this.status.media_attachments[0].meta || !this.status.media_attachments[0].meta.original || !this.status.media_attachments[0].meta.original.height ) { return; @@ -109,4 +109,4 @@ } } } - \ No newline at end of file + From 10119bbbea8755145481d8ba1621474e8c99fe72 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Tue, 6 Apr 2021 23:37:53 -0600 Subject: [PATCH 12/13] Update PublicApiController, limit network pagination to 3 months --- app/Http/Controllers/PublicApiController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Http/Controllers/PublicApiController.php b/app/Http/Controllers/PublicApiController.php index 23231b218..dabe5a6d9 100644 --- a/app/Http/Controllers/PublicApiController.php +++ b/app/Http/Controllers/PublicApiController.php @@ -523,7 +523,7 @@ class PublicApiController extends Controller ->whereIn('type', ['photo', 'photo:album', 'video', 'video:album', 'photo:video:album']) ->whereNotNull('uri') ->whereScope('public') - // ->where('created_at', '>', now()->subMonths(3)) + ->where('created_at', '>', now()->subMonths(3)) ->orderBy('created_at', 'desc') ->limit($limit) ->get(); From aa5bb3f7fae961f7652fb103a561ceb39a1cd18d Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Tue, 6 Apr 2021 23:38:27 -0600 Subject: [PATCH 13/13] Update changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index e2a3ae897..441b99baf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -62,6 +62,7 @@ - Updated Compose Apis, refactor rate limits. ([42375b3d](https://github.com/pixelfed/pixelfed/commit/42375b3d)) - Updated PublicApiController, show unlisted comments. ([e1c6297e](https://github.com/pixelfed/pixelfed/commit/e1c6297e)) - Updated ApiV1Controller, add missing variable. ([886ea617](https://github.com/pixelfed/pixelfed/commit/886ea617)) +- Updated PublicApiController, limit network pagination to 3 months. ([10119bbb](https://github.com/pixelfed/pixelfed/commit/10119bbb)) - ([](https://github.com/pixelfed/pixelfed/commit/)) ## [v0.10.10 (2021-01-28)](https://github.com/pixelfed/pixelfed/compare/v0.10.9...v0.10.10)