From f5171d598f00cc8dd60d9f26e1d45c1b92c350a4 Mon Sep 17 00:00:00 2001 From: elweyn Date: Mon, 31 Jul 2023 10:53:40 +0200 Subject: [PATCH 01/12] fix(webapp): add missing locales. --- webapp/locales/de.json | 3 +++ webapp/locales/en.json | 3 +++ webapp/locales/fr.json | 4 ++++ 3 files changed, 10 insertions(+) diff --git a/webapp/locales/de.json b/webapp/locales/de.json index 4743a2488..6b7fd906a 100644 --- a/webapp/locales/de.json +++ b/webapp/locales/de.json @@ -723,6 +723,9 @@ "unread": "Ungelesen" }, "group": "Beschreibung", + "headerMenuButton": { + "tooltip": "Notifikationen" + }, "markAllAsRead": "Markiere alle als gelesen", "pageLink": "Alle Benachrichtigungen", "post": "Beitrag oder Gruppe", diff --git a/webapp/locales/en.json b/webapp/locales/en.json index 752e545ab..b5bcef3bb 100644 --- a/webapp/locales/en.json +++ b/webapp/locales/en.json @@ -723,6 +723,9 @@ "unread": "Unread" }, "group": "Description", + "headerMenuButton": { + "tooltip": "Notifications" + }, "markAllAsRead": "Mark all as read", "pageLink": "All notifications", "post": "Post or Group", diff --git a/webapp/locales/fr.json b/webapp/locales/fr.json index 3f97d84c2..f40e9240e 100644 --- a/webapp/locales/fr.json +++ b/webapp/locales/fr.json @@ -405,6 +405,10 @@ "read": "Lire", "unread": "Non lu" }, + "group": "Description", + "headerMenuButton": { + "tooltip": "Notifications" + }, "markAllAsRead": "Tout marquer comme lu", "pageLink": "Toutes les notifications", "post": "Post", From 359101bb4c98a99991271213e21bec31ba576aeb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= Date: Wed, 2 Aug 2023 11:36:40 +0200 Subject: [PATCH 02/12] Fix wrong labels in filter menu buttons --- webapp/components/FilterMenu/FollowingFilter.vue | 4 ++-- webapp/components/FilterMenu/OrderByFilter.vue | 2 +- webapp/locales/de.json | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/webapp/components/FilterMenu/FollowingFilter.vue b/webapp/components/FilterMenu/FollowingFilter.vue index b650f17b7..1df121a39 100644 --- a/webapp/components/FilterMenu/FollowingFilter.vue +++ b/webapp/components/FilterMenu/FollowingFilter.vue @@ -22,11 +22,11 @@ icon="user-plus" :label="$t('filter-menu.following')" :filled="filteredByUsersFollowed" - :title="$t('contribution.filterFollow')" + :title="$t('filter-menu.following')" @click="toggleFilteredByFollowed(currentUser.id)" size="small" > - {{ $t('contribution.filterFollow') }} + {{ $t('filter-menu.following') }}
  • diff --git a/webapp/components/FilterMenu/OrderByFilter.vue b/webapp/components/FilterMenu/OrderByFilter.vue index 57c173152..87cdcf897 100644 --- a/webapp/components/FilterMenu/OrderByFilter.vue +++ b/webapp/components/FilterMenu/OrderByFilter.vue @@ -24,7 +24,7 @@ data-test="oldest-button" size="small" > - {{ buttonTitle('asc') }} + {{ buttonLabel('asc') }}
    • diff --git a/webapp/locales/de.json b/webapp/locales/de.json index 6b1edaabe..a1407940d 100644 --- a/webapp/locales/de.json +++ b/webapp/locales/de.json @@ -301,7 +301,7 @@ }, "filterFollow": "Nutzern, denen ich folge", "filterMasonryGrid": { - "myFriends": "Nutzer denen ich folge", + "myFriends": "Nutzer, denen ich folge", "myGroups": "Aus meinen Gruppen", "myTopics": "Meine Themen", "noFilter": "Inhalte filtern", From d57ff2d4efa1e56c85450d79f161267588da8bfc Mon Sep 17 00:00:00 2001 From: mahula Date: Wed, 2 Aug 2023 12:52:39 +0200 Subject: [PATCH 03/12] set back notification text --- webapp/locales/de.json | 2 +- webapp/locales/en.json | 2 +- webapp/locales/fr.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/webapp/locales/de.json b/webapp/locales/de.json index c21d2d8ae..62860ae13 100644 --- a/webapp/locales/de.json +++ b/webapp/locales/de.json @@ -726,7 +726,7 @@ }, "group": "Beschreibung", "headerMenuButton": { - "tooltip": "Notifikationen" + "tooltip": "Meine Banachrichtigungen" }, "markAllAsRead": "Markiere alle als gelesen", "pageLink": "Alle Benachrichtigungen", diff --git a/webapp/locales/en.json b/webapp/locales/en.json index 0d576834e..a6060f3a0 100644 --- a/webapp/locales/en.json +++ b/webapp/locales/en.json @@ -726,7 +726,7 @@ }, "group": "Description", "headerMenuButton": { - "tooltip": "Notifications" + "tooltip": "My notifications" }, "markAllAsRead": "Mark all as read", "pageLink": "All notifications", diff --git a/webapp/locales/fr.json b/webapp/locales/fr.json index f40e9240e..6f98be2e9 100644 --- a/webapp/locales/fr.json +++ b/webapp/locales/fr.json @@ -407,7 +407,7 @@ }, "group": "Description", "headerMenuButton": { - "tooltip": "Notifications" + "tooltip": "Mes notifications" }, "markAllAsRead": "Tout marquer comme lu", "pageLink": "Toutes les notifications", From 28e9ab3f3975f0ec8c468ce6c037a40fe34fc98e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= Date: Mon, 7 Aug 2023 11:07:11 +0200 Subject: [PATCH 04/12] Release v3.0.0 --- CHANGELOG.md | 96 ++++++++++++++++++++++++++ backend/package.json | 4 +- package.json | 2 +- webapp/maintenance/source/package.json | 2 +- webapp/package.json | 2 +- 5 files changed, 101 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index cc09544ba..d946d1d94 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,8 +4,104 @@ All notable changes to this project will be documented in this file. Dates are d Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog). +#### [3.0.0](https://github.com/Ocelot-Social-Community/Ocelot-Social/compare/2.7.0...3.0.0) + +- fix(webapp): add missing locales [`#6652`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/6652) +- fix(webapp): fix wrong labels in filter menu buttons [`#6656`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/6656) +- refactor(webapp): refactor filter menu [`#6535`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/6535) +- fix(webapp): correct chat usertag profile link [`#6646`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/6646) +- fix(webapp): fix create event typing issues [`#6643`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/6643) +- fix(webapp): mini chat: dynamic header buttons [`#6641`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/6641) +- fix(webapp): start search of user after three characters (chat new room, add group member) [`#6639`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/6639) +- refactor(webapp): updated/refactored ui of create post page [`#6559`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/6559) +- fix(webapp): fix code in editor component [`#6624`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/6624) +- fix(backend): security subscriptions [`#6621`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/6621) +- fix(webapp): change the background color of my messages to the same color as side menu [`#6620`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/6620) +- feat(webapp): change general search hint [`#6619`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/6619) +- feat(webapp): chat component + button open search [`#6618`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/6618) +- feat(webapp): change color red to green on cancel buttons of post and comments [`#6565`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/6565) +- fix(webapp): groups highlighting [`#6608`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/6608) +- feat(webapp): chat link to chat page [`#6617`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/6617) +- fix(webapp): fix lastMessage to contain proper values [`#6615`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/6615) +- fix(backend): chat create message - only take 2000 chat message characters [`#6613`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/6613) +- feat(webapp): chat component can now show clickable urls [`#6614`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/6614) +- fix(webapp): highlight username functionality for chat [`#6609`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/6609) +- fix(webapp): fix chat behaviour [`#6611`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/6611) +- feat(webapp): chat seen check style [`#6612`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/6612) +- feat(webapp): on open chat room page close or on change profile and click chat change small chat [`#6605`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/6605) +- feat(webapp): change text for chat room search to `Filter chat rooms` [`#6601`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/6601) +- fix(backend): convert indexId to string (neo4j number problem) [`#6603`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/6603) +- fix(other): github cache in workflow [`#6604`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/6604) +- feat(webapp): show last message and unread count in room list [`#6595`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/6595) +- refactor(other): cache docker images for backend webapp e2e testing [`#6585`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/6585) +- feat(backend): chat message added subscription [`#6586`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/6586) +- refactor(backend): removed promise all from seed [`#6599`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/6599) +- feat(webapp): add headline to chat page [`#6563`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/6563) +- fix(other): set workflow not to fail while deleting cache [`#6594`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/6594) +- feat(backend): room count subscription [`#6584`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/6584) +- fix(backend): profile query fix [`#6587`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/6587) +- feat(webapp): mark messages as seen [`#6567`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/6567) +- feat(webapp): changed usertag in chat messages to user-slug [`#6555`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/6555) +- feat(backend): more room properties [`#6564`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/6564) +- refactor(backend): chat messages - order by indexId instead of createdAt [`#6562`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/6562) +- feat(webapp): chat language is reactive [`#6560`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/6560) +- feat(backend): unread rooms query [`#6566`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/6566) +- feat(webapp): chat last seen in webapp [`#6580`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/6580) +- feat(webapp): chat paginate rooms [`#6579`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/6579) +- refactor(other): use cached docker images in github e2e flow to decrease run time of e2e test job runs [`#6582`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/6582) +- fix(webapp): show room header images. [`#6581`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/6581) +- feat(backend): chat seed [`#6561`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/6561) +- feat(webapp): chat message pagination [`#6549`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/6549) +- feat(webapp): chat remove reply smileys [`#6553`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/6553) +- feat(webapp): remove message actions for chat [`#6552`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/6552) +- feat(backend): more message props [`#6547`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/6547) +- refactor(backend): fix seed to not use promise all where easily refactored [`#6520`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/6520) +- refactor(other): add proper reporting to cypress tests [`#6540`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/6540) +- refactor(other): cypress - migrate from cypress-file-upload to .selectFile() [`#6528`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/6528) +- feat(webapp): change chat style and lang [`#6517`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/6517) +- feat(webapp): show events with locations on the map [`#6518`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/6518) +- feat(webapp): refine chat notification in header menu and chat button on user profile [`#6550`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/6550) +- refactor(other): disable cypress test retries [`#6527`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/6527) +- feat(webapp): event creation page -better placeholder texts for venue and city inputs [`#6525`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/6525) +- refactor(other): refine webapp github workflow conditions [`#6526`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/6526) +- docs(other): update TODO-next-update.md for 2.7.0-470 [`#6532`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/6532) +- fix(backend): chat - do not allow to create room with self [`#6530`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/6530) +- feat(webapp): chat message capability [`#6524`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/6524) +- chore(backend): bump @faker-js/faker from 5.1.0 to 8.0.2 [`#6368`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/6368) +- chore(other): bump cypress from 12.14.0 to 12.17.0 [`#6509`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/6509) +- feat(webapp): chat rooms [`#6519`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/6519) +- fix(other): fix branded build - rename files to js for the webapp [`#6516`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/6516) +- fix(backend): fix branded build (migration) [`#6508`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/6508) +- fix(backend): fix branded build [`#6507`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/6507) +- feat(webapp): create a component chat scaffholding [`#6503`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/6503) +- fix(webapp): fix create post & notifications [`#6505`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/6505) +- feat(backend): typescript eslint backend [`#6478`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/6478) +- fix(backend): subscriptions [`#6477`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/6477) +- fix(backend): seed reports [`#6472`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/6472) +- refactor(backend): remove activity pub [`#6470`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/6470) +- fix(webapp): change registration `terms and conditions`, `data privacy` links to use `page-params-link` [`#6441`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/6441) +- feat(backend): message properties [`#6471`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/6471) +- feat(backend): room properties [`#6451`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/6451) +- fix(backend): create message mutation [`#6469`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/6469) +- feat(backend): messages [`#6450`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/6450) +- feat(backend): rooms [`#6444`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/6444) +- fix(other): neo4j config map & node version [`#6464`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/6464) +- Bump @babel/core from 7.22.1 to 7.22.5 [`#6413`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/6413) +- refactor(database): update neo4j to 4.4 [`#6306`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/6306) +- Bump cypress from 12.13.0 to 12.14.0 [`#6414`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/6414) +- Bump node from 20.2.0-alpine3.17 to 20.3.0-alpine3.17 in /backend [`#6409`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/6409) +- Bump node from 20.2.0-alpine3.17 to 20.3.0-alpine3.17 in /webapp [`#6408`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/6408) +- fix(backend): typescript fix [`#6448`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/6448) +- refactor(backend): migrate completely to typescript [`#6434`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/6434) +- remove package cypress-file-upload from e2e testing [`73f6bc6`](https://github.com/Ocelot-Social-Community/Ocelot-Social/commit/73f6bc642194b0c73769d4e8d8e53645b6e80adf) +- fixed cypress [`5f545f3`](https://github.com/Ocelot-Social-Community/Ocelot-Social/commit/5f545f3b8fc6927954e036b27ad2e123bcd36149) +- fix seed to not use promise all where easily refactored [`1b0f512`](https://github.com/Ocelot-Social-Community/Ocelot-Social/commit/1b0f5124159033214f99bfbc4cebe9dfaa7dd76e) + #### [2.7.0](https://github.com/Ocelot-Social-Community/Ocelot-Social/compare/2.6.0...2.7.0) +> 14 June 2023 + +- chore(release): v2.7.0 [`#6440`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/6440) - fix(webapp): fix event teaser date from start to end by new components [`#6385`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/6385) - refactor(webapp): optimize create and update event form [`#6381`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/6381) - feat(backend): show events not ended yet [`#6405`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/6405) diff --git a/backend/package.json b/backend/package.json index 48703b649..14c9e9a6f 100644 --- a/backend/package.json +++ b/backend/package.json @@ -1,6 +1,6 @@ { "name": "ocelot-social-backend", - "version": "2.7.0", + "version": "3.0.0", "description": "GraphQL Backend for ocelot.social", "repository": "https://github.com/Ocelot-Social-Community/Ocelot-Social", "author": "ocelot.social Community", @@ -113,9 +113,9 @@ "eslint-plugin-prettier": "^4.2.1", "eslint-plugin-promise": "^6.1.1", "eslint-plugin-security": "^1.7.1", - "prettier": "^2.8.7", "jest": "^27.2.4", "nodemon": "~2.0.2", + "prettier": "^2.8.7", "rosie": "^2.0.1", "ts-jest": "^27.0.5", "ts-node": "^10.9.1", diff --git a/package.json b/package.json index afe65426a..a656a0b4e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ocelot-social", - "version": "2.7.0", + "version": "3.0.0", "description": "Free and open source software program code available to run social networks.", "author": "ocelot.social Community", "license": "MIT", diff --git a/webapp/maintenance/source/package.json b/webapp/maintenance/source/package.json index ad3a60e76..e74213608 100644 --- a/webapp/maintenance/source/package.json +++ b/webapp/maintenance/source/package.json @@ -1,6 +1,6 @@ { "name": "@ocelot-social/maintenance", - "version": "2.7.0", + "version": "3.0.0", "description": "Maintenance page for ocelot.social", "repository": "https://github.com/Ocelot-Social-Community/Ocelot-Social", "author": "ocelot.social Community", diff --git a/webapp/package.json b/webapp/package.json index f2a756ca4..61090a5b3 100644 --- a/webapp/package.json +++ b/webapp/package.json @@ -1,6 +1,6 @@ { "name": "ocelot-social-webapp", - "version": "2.7.0", + "version": "3.0.0", "description": "ocelot.social Frontend", "repository": "https://github.com/Ocelot-Social-Community/Ocelot-Social", "author": "ocelot.social Community", From 6f43321abad945602529b962e536546ab541cd70 Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Mon, 7 Aug 2023 15:56:56 +0200 Subject: [PATCH 05/12] try to fix avatars --- webapp/components/Chat/Chat.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/webapp/components/Chat/Chat.vue b/webapp/components/Chat/Chat.vue index eb0ce4433..4e973c894 100644 --- a/webapp/components/Chat/Chat.vue +++ b/webapp/components/Chat/Chat.vue @@ -334,6 +334,7 @@ export default { ;[...this.messages, ...Message].forEach((m) => { if (m.senderId !== this.currentUser.id) m.seen = true m.date = new Date(m.date).toDateString() + m.avatar = this.$filters.proxyApiUrl(m.avatar) msgs[m.indexId] = m }) this.messages = msgs.filter(Boolean) @@ -413,7 +414,7 @@ export default { } : null, users: room.users.map((u) => { - return { ...u, username: u.name, avatar: u.avatar?.url } + return { ...u, username: u.name, avatar: this.$filters.proxyApiUrl(u.avatar?.url) } }), } if (!fixedRoom.avatar) { From b591820eb6c1ced2556fa5998cd568d7d0ab9e59 Mon Sep 17 00:00:00 2001 From: elweyn Date: Tue, 8 Aug 2023 07:56:02 +0200 Subject: [PATCH 06/12] Fix avatar in Room. --- webapp/components/Chat/Chat.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/webapp/components/Chat/Chat.vue b/webapp/components/Chat/Chat.vue index 4e973c894..7a46de387 100644 --- a/webapp/components/Chat/Chat.vue +++ b/webapp/components/Chat/Chat.vue @@ -407,6 +407,7 @@ export default { const fixedRoom = { ...room, index: room.lastMessage ? room.lastMessage.date : room.createdAt, + avatar: this.$filters.proxyApiUrl(room.avatar), lastMessage: room.lastMessage ? { ...room.lastMessage, From 5c1ab880127a5f4c1b457598fafd3ae9fe1a0d12 Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Tue, 8 Aug 2023 22:21:24 +0200 Subject: [PATCH 07/12] conditional url replacement --- webapp/components/Chat/Chat.vue | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/webapp/components/Chat/Chat.vue b/webapp/components/Chat/Chat.vue index 7a46de387..6535ece4e 100644 --- a/webapp/components/Chat/Chat.vue +++ b/webapp/components/Chat/Chat.vue @@ -334,7 +334,9 @@ export default { ;[...this.messages, ...Message].forEach((m) => { if (m.senderId !== this.currentUser.id) m.seen = true m.date = new Date(m.date).toDateString() - m.avatar = this.$filters.proxyApiUrl(m.avatar) + if(!m.avatar.startsWith('/api/')){ + m.avatar = this.$filters.proxyApiUrl(m.avatar) + } msgs[m.indexId] = m }) this.messages = msgs.filter(Boolean) From 7e697d7f9ddce184911680485ceac9d6b510349f Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Tue, 8 Aug 2023 22:22:11 +0200 Subject: [PATCH 08/12] lint fixes --- webapp/components/Chat/Chat.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapp/components/Chat/Chat.vue b/webapp/components/Chat/Chat.vue index 6535ece4e..0671891cb 100644 --- a/webapp/components/Chat/Chat.vue +++ b/webapp/components/Chat/Chat.vue @@ -334,7 +334,7 @@ export default { ;[...this.messages, ...Message].forEach((m) => { if (m.senderId !== this.currentUser.id) m.seen = true m.date = new Date(m.date).toDateString() - if(!m.avatar.startsWith('/api/')){ + if (!m.avatar.startsWith('/api/')) { m.avatar = this.$filters.proxyApiUrl(m.avatar) } msgs[m.indexId] = m From 0daeb5b957e11d206ceddc3e8b275929e1850d18 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= Date: Wed, 9 Aug 2023 11:52:59 +0200 Subject: [PATCH 09/12] =?UTF-8?q?Releasde=20v3.0.1=20=E2=80=93=20fix=20cha?= =?UTF-8?q?t=20avatars?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 12 +++++++++++- backend/package.json | 2 +- package.json | 2 +- webapp/maintenance/source/package.json | 2 +- webapp/package.json | 2 +- 5 files changed, 15 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d946d1d94..8950daedd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,8 +4,18 @@ All notable changes to this project will be documented in this file. Dates are d Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog). -#### [3.0.0](https://github.com/Ocelot-Social-Community/Ocelot-Social/compare/2.7.0...3.0.0) +#### [3.0.1](https://github.com/Ocelot-Social-Community/Ocelot-Social/compare/3.0.0...3.0.1) +- fix(webapp): try to fix avatars [`#6660`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/6660) +- conditional url replacement [`5c1ab88`](https://github.com/Ocelot-Social-Community/Ocelot-Social/commit/5c1ab880127a5f4c1b457598fafd3ae9fe1a0d12) +- try to fix avatars [`6f43321`](https://github.com/Ocelot-Social-Community/Ocelot-Social/commit/6f43321abad945602529b962e536546ab541cd70) +- lint fixes [`7e697d7`](https://github.com/Ocelot-Social-Community/Ocelot-Social/commit/7e697d7f9ddce184911680485ceac9d6b510349f) + +### [3.0.0](https://github.com/Ocelot-Social-Community/Ocelot-Social/compare/2.7.0...3.0.0) + +> 7 August 2023 + +- chore(other): release v3.0.0 [`#6658`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/6658) - fix(webapp): add missing locales [`#6652`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/6652) - fix(webapp): fix wrong labels in filter menu buttons [`#6656`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/6656) - refactor(webapp): refactor filter menu [`#6535`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/6535) diff --git a/backend/package.json b/backend/package.json index 14c9e9a6f..9b5dde62e 100644 --- a/backend/package.json +++ b/backend/package.json @@ -1,6 +1,6 @@ { "name": "ocelot-social-backend", - "version": "3.0.0", + "version": "3.0.1", "description": "GraphQL Backend for ocelot.social", "repository": "https://github.com/Ocelot-Social-Community/Ocelot-Social", "author": "ocelot.social Community", diff --git a/package.json b/package.json index a656a0b4e..e16abd8f5 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ocelot-social", - "version": "3.0.0", + "version": "3.0.1", "description": "Free and open source software program code available to run social networks.", "author": "ocelot.social Community", "license": "MIT", diff --git a/webapp/maintenance/source/package.json b/webapp/maintenance/source/package.json index e74213608..039765a68 100644 --- a/webapp/maintenance/source/package.json +++ b/webapp/maintenance/source/package.json @@ -1,6 +1,6 @@ { "name": "@ocelot-social/maintenance", - "version": "3.0.0", + "version": "3.0.1", "description": "Maintenance page for ocelot.social", "repository": "https://github.com/Ocelot-Social-Community/Ocelot-Social", "author": "ocelot.social Community", diff --git a/webapp/package.json b/webapp/package.json index 61090a5b3..14a962cde 100644 --- a/webapp/package.json +++ b/webapp/package.json @@ -1,6 +1,6 @@ { "name": "ocelot-social-webapp", - "version": "3.0.0", + "version": "3.0.1", "description": "ocelot.social Frontend", "repository": "https://github.com/Ocelot-Social-Community/Ocelot-Social", "author": "ocelot.social Community", From 2c123313ed6267bb1c88470ba7ae3f4f693cfc15 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= Date: Fri, 11 Aug 2023 11:14:47 +0200 Subject: [PATCH 10/12] Fix 'm.avatar is null' error message --- webapp/components/Chat/Chat.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapp/components/Chat/Chat.vue b/webapp/components/Chat/Chat.vue index 0671891cb..1d22a0a39 100644 --- a/webapp/components/Chat/Chat.vue +++ b/webapp/components/Chat/Chat.vue @@ -334,7 +334,7 @@ export default { ;[...this.messages, ...Message].forEach((m) => { if (m.senderId !== this.currentUser.id) m.seen = true m.date = new Date(m.date).toDateString() - if (!m.avatar.startsWith('/api/')) { + if (!m.avatar?.startsWith('/api/')) { m.avatar = this.$filters.proxyApiUrl(m.avatar) } msgs[m.indexId] = m From 5b954197dc93bd5715f657539ca1b9b32d7d557a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= Date: Fri, 11 Aug 2023 12:27:21 +0200 Subject: [PATCH 11/12] Remove font 'Quicksand' from the chat - Set style of chat component to 'scoped' --- webapp/components/Chat/Chat.vue | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/webapp/components/Chat/Chat.vue b/webapp/components/Chat/Chat.vue index 0671891cb..af9cde60d 100644 --- a/webapp/components/Chat/Chat.vue +++ b/webapp/components/Chat/Chat.vue @@ -462,10 +462,7 @@ export default { }, } -