Merge pull request #1061 from tchapgouv/875-generer-des-liens-de-part…

…age-avec-parametre-via

875 generer des liens de partage avec parametre via

Config/AppVersion.xcconfig

@@ -15,5 +15,5 @@
 //
 
 // Version
-MARKETING_VERSION = 2.7.8
+MARKETING_VERSION = 2.7.9
 CURRENT_PROJECT_VERSION = 1

Tchap/Modules/Room/RoomAccessByLink/RoomAccessByLinkViewModel.swift

@@ -149,6 +149,19 @@ final class RoomAccessByLinkViewModel: RoomAccessByLinkViewModelType {
                 } else {
                     isUnrestrictedRoom = false
                 }
+            } else if let permalink = Tools.permalinkToRoomWithoutAlias(from: roomState) {
+                // If room as no canonical alias but permalink can be computed uing roomId and homeServers from members
+                // use this form of permalink (Tchap on web does like this).
+                link = permalink
+                if let room = self.session.room(withRoomId: roomId), let summary = room.summary {
+                    if case RoomAccessRule.unrestricted = summary.tc_roomAccessRule() {
+                        isUnrestrictedRoom = true
+                    } else {
+                        isUnrestrictedRoom = false
+                    }
+                } else {
+                    isUnrestrictedRoom = false
+                }
             } else {
                 link = TchapL10n.roomSettingsRoomAccessByLinkInvalid
                 isUnrestrictedRoom = false

Tchap/Utils/Tools.h

@@ -64,6 +64,16 @@
  */
 + (NSString*)permalinkToRoom:(NSString*)roomIdOrAlias;
 
+
+/*
+ Return a permalink to a room which has no alias.
+ 
+ @param roomState the RoomState of the room, containing the roomId and the room members necessary to build the permalink.
+ @return the Tchap permalink.
+ */
++ (NSString *)permalinkToRoomWithoutAliasFromRoomState:(MXRoomState *)roomState;
+
+
 /*
  Return a permalink to an event.
  
@@ -73,4 +83,5 @@
  */
 + (NSString*)permalinkToEvent:(NSString*)eventId inRoom:(NSString*)roomIdOrAlias;
 
+
 @end

Tchap/Utils/Tools.m

@@ -150,10 +150,43 @@ + (NSString *)permalinkToRoom:(NSString *)roomIdOrAlias
     return [NSString stringWithFormat:@"%@/#/room/%@", urlPrefix, roomIdOrAlias];
 }
 
++ (NSString *)permalinkToRoomWithoutAliasFromRoomState:(MXRoomState *)state {
+    NSString *roomId = state.roomId;
+
+    NSArray<MXRoomMember *> *members = state.members.joinedMembers;
+
+    NSMutableSet<NSString *> *memberHomeservers = [NSMutableSet setWithCapacity:members.count];
+
+    // Add the homeServer hosting the room.
+    [memberHomeservers addObject:[roomId componentsSeparatedByString:@":"].lastObject];
+
+    // List unique members' homeServers in memberHomeservers. Limit to 3
+    [members enumerateObjectsUsingBlock:^(MXRoomMember * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) {
+        NSArray<NSString *> *userIdParts = [obj.userId componentsSeparatedByString:@":"];
+        if (userIdParts.count > 1)
+        {
+            [memberHomeservers addObject:userIdParts.lastObject]; // NSMutableSet only add object if not already present in the Set.
+
+            // Stop if 3 homeServers are listed.
+            if (memberHomeservers.count >= 3)
+            {
+                *stop = YES;
+            }
+        }
+    }];
+
+    NSString *urlPrefix = BuildSettings.clientPermalinkBaseUrl;
+    NSString *viaParameters = [NSString stringWithFormat:@"?via=%@", [memberHomeservers.allObjects componentsJoinedByString:@"&via="]];
+    NSString *permalinkToRoom = [NSString stringWithFormat:@"%@/#/room/%@%@", urlPrefix, roomId, viaParameters];
+
+    return permalinkToRoom;
+}
+
 + (NSString *)permalinkToEvent:(NSString *)eventId inRoom:(NSString *)roomIdOrAlias
 {
     NSString *urlPrefix = BuildSettings.clientPermalinkBaseUrl;
     return [NSString stringWithFormat:@"%@/#/room/%@/%@", urlPrefix, roomIdOrAlias, eventId];
 }
 
+
 @end

changelog.d/875.bugfix

@@ -0,0 +1 @@
+Correction de la génération de lien de partage sur les forums

towncrier.toml

@@ -1,6 +1,6 @@
 [tool.towncrier]
 name = "Changes in"
-version = "2.7.8"
+version = "2.7.9"
 filename = "TCHAP_CHANGES.md"
 directory = "changelog.d"
 template = "changelog.d/_template.md.jinja"