+ {{ + $t( + "Sorry, we wen't able to save your feedback. Don't worry, we'll try to fix this issue anyway." + ) + }} +
+{{ $t("Thanks a lot, your feedback was submitted!") }}
+
+
- {{ $t("You may also:") }}
+
{{ $t( "Please add as many details as possible to help identify the problem." @@ -89,14 +151,14 @@
{{ $t("Error stacktrace") }}
{{ error.stack }}
- +
{{ $t( "The technical details of the error can help developers solve the problem more easily. Please add them to your feedback." ) }}
-
+
diff --git a/js/src/views/Admin/AdminUserProfile.vue b/js/src/views/Admin/AdminUserProfile.vue
index a2bd191ef..d6a6da772 100644
--- a/js/src/views/Admin/AdminUserProfile.vue
+++ b/js/src/views/Admin/AdminUserProfile.vue
@@ -95,7 +95,7 @@
>
{{ instance.domain }}
-
+
{{ $t("Uploaded media size") }}
-
-
+
@@ -78,7 +78,7 @@ >
-
+
+
{{
$tc("{count} members", group.members.total, {
@@ -521,9 +558,10 @@
"
>
+
-
diff --git a/js/src/views/Group/Group.vue b/js/src/views/Group/Group.vue
index 68889f8d9..a2c0522c3 100644
--- a/js/src/views/Group/Group.vue
+++ b/js/src/views/Group/Group.vue
@@ -27,11 +27,11 @@
+
-
+ {{ $t("Only Mobilizon instances can be followed") }}
+
+
- {{ $t("Only Mobilizon instances can be followed") }}
-
{{ group.name }}
@@ -78,7 +78,7 @@ >
+
{{ $t("Group settings") }}
-
- {{
- $t("Join group")
- }}
- {{ $t("Join group") }}
+
+
+
+
+
+
+
+
+
{{ $t("Cancel membership request") }}
- {{ $t("Join group") }}
- {{ $t("Follow") }}
- {{ $t("Follow") }}
-
-
- {{
- $t("group's upcoming public events")
- }}
- {{
- $t("access to the group's private content as well")
- }}
-
-
@@ -506,6 +537,12 @@
$t("View full profile")
}}
+
- {{
- $t("No address defined")
- }}
+ {{ $t("No address defined") }}
+
{{ $t("No public upcoming events") }}
-
-
- {{ $t("your notification settings") }}
+
+
-
+ {{ $t("your notification settings") }}
+
+
+ {{ $t("View past events") }}
{{ $t("View all events") }}
+
- {{ $t("Latest posts") }}
+
+ {{ $t("Latest posts") }}
{{ $t("View all posts") }} {{ $t("View all posts") }}
@@ -687,7 +740,7 @@ import DiscussionListItem from "@/components/Discussion/DiscussionListItem.vue";
import MultiPostListItem from "@/components/Post/MultiPostListItem.vue";
import ResourceItem from "@/components/Resource/ResourceItem.vue";
import FolderItem from "@/components/Resource/FolderItem.vue";
-import { Address } from "@/types/address.model";
+import { Address, addressFullName } from "@/types/address.model";
import Invitations from "@/components/Group/Invitations.vue";
import addMinutes from "date-fns/addMinutes";
import { CONFIG } from "@/graphql/config";
@@ -768,6 +821,8 @@ export default class Group extends mixins(GroupMixin) {
displayName = displayName;
+ addressFullName = addressFullName;
+
PostVisibility = PostVisibility;
Openness = Openness;
@@ -788,25 +843,38 @@ export default class Group extends mixins(GroupMixin) {
}
async joinGroup(): Promise {
- const [group, currentActorId] = [
- usernameWithDomain(this.group),
- this.currentActor.id,
- ];
- this.$apollo.mutate({
- mutation: JOIN_GROUP,
- variables: {
- groupId: this.group.id,
- },
- refetchQueries: [
- {
- query: PERSON_STATUS_GROUP,
- variables: {
- id: currentActorId,
- group,
- },
+ if (!this.currentActor?.id) {
+ this.$router.push({
+ name: RouteName.GROUP_JOIN,
+ params: { preferredUsername: usernameWithDomain(this.group) },
+ });
+ return;
+ }
+ try {
+ const [group, currentActorId] = [
+ usernameWithDomain(this.group),
+ this.currentActor.id,
+ ];
+ await this.$apollo.mutate({
+ mutation: JOIN_GROUP,
+ variables: {
+ groupId: this.group.id,
},
- ],
- });
+ refetchQueries: [
+ {
+ query: PERSON_STATUS_GROUP,
+ variables: {
+ id: currentActorId,
+ group,
+ },
+ },
+ ],
+ });
+ } catch (error: any) {
+ if (error.graphQLErrors && error.graphQLErrors.length > 0) {
+ this.$notifier.error(error.graphQLErrors[0].message);
+ }
+ }
}
protected async openLeaveGroupModal(): Promise {
@@ -852,6 +920,13 @@ export default class Group extends mixins(GroupMixin) {
}
async followGroup(): Promise {
+ if (!this.currentActor?.id) {
+ this.$router.push({
+ name: RouteName.GROUP_FOLLOW,
+ params: { preferredUsername: usernameWithDomain(this.group) },
+ });
+ return;
+ }
try {
const [group, currentActorId] = [
usernameWithDomain(this.group),
@@ -1070,6 +1145,41 @@ export default class Group extends mixins(GroupMixin) {
}),
};
}
+
+ get showFollowButton(): boolean {
+ return (
+ (!this.isCurrentActorFollowing || this.previewPublic) &&
+ this.currentActor?.id !== undefined
+ );
+ }
+
+ get showJoinButton(): boolean {
+ return (
+ (!this.isCurrentActorAGroupMember || this.previewPublic) &&
+ this.currentActor?.id !== undefined
+ );
+ }
+
+ get isGroupInviteOnly(): boolean {
+ return (
+ (!this.isCurrentActorAGroupMember || this.previewPublic) &&
+ this.group?.openness === Openness.INVITE_ONLY
+ );
+ }
+
+ get areGroupMembershipsModerated(): boolean {
+ return (
+ (!this.isCurrentActorAGroupMember || this.previewPublic) &&
+ this.group?.openness === Openness.MODERATED
+ );
+ }
+
+ get doesGroupManuallyApprovesFollowers(): boolean {
+ return (
+ (!this.isCurrentActorAGroupMember || this.previewPublic) &&
+ this.group?.manuallyApprovesFollowers
+ );
+ }
}
diff --git a/js/src/views/Group/GroupSettings.vue b/js/src/views/Group/GroupSettings.vue
index da70ab3ef..da5479e33 100644
--- a/js/src/views/Group/GroupSettings.vue
+++ b/js/src/views/Group/GroupSettings.vue
@@ -259,17 +259,22 @@ export default class GroupSettings extends mixins(GroupMixin) {
@Watch("group")
async watchUpdateGroup(oldGroup: IGroup, newGroup: IGroup): Promise {
- if (
- oldGroup?.avatar !== undefined &&
- oldGroup?.avatar !== newGroup?.avatar
- ) {
- this.avatarFile = await buildFileFromIMedia(this.group.avatar);
- }
- if (
- oldGroup?.banner !== undefined &&
- oldGroup?.banner !== newGroup?.banner
- ) {
- this.bannerFile = await buildFileFromIMedia(this.group.banner);
+ try {
+ if (
+ oldGroup?.avatar !== undefined &&
+ oldGroup?.avatar !== newGroup?.avatar
+ ) {
+ this.avatarFile = await buildFileFromIMedia(this.group.avatar);
+ }
+ if (
+ oldGroup?.banner !== undefined &&
+ oldGroup?.banner !== newGroup?.banner
+ ) {
+ this.bannerFile = await buildFileFromIMedia(this.group.banner);
+ }
+ } catch (e) {
+ // Catch errors while building media
+ console.error(e);
}
this.editableGroup = { ...this.group };
}
diff --git a/js/src/views/Posts/Post.vue b/js/src/views/Posts/Post.vue
index efc0f300c..4700d7c37 100644
--- a/js/src/views/Posts/Post.vue
+++ b/js/src/views/Posts/Post.vue
@@ -15,7 +15,9 @@
v-if="post.draft"
>{{ $t("Draft") }}
-
@@ -553,17 +591,6 @@
-
- {{ $t("About") }}
-
-
- {{ $t("This group doesn't have a description yet.") }}
-
-
{{ $t("Upcoming events") }}
-
+ {{ $t("View all events") }}
+
- {{ post.title }}
++ {{ post.title }} +