Merge pull request #1713 from matrix-org/alfogrillo/fallback_poll_end…

…ed_event Add fallback text for m.poll.end events (PSG-1156)
matrix-org · Feb 10, 2023 · f5a4ac9 · f5a4ac9
2 parents 9dd83ea + cdfc9a6
commit f5a4ac9
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 7 deletions.
diff --git a/MatrixSDK/Data/MXRoom.m b/MatrixSDK/Data/MXRoom.m
@@ -2220,7 +2220,7 @@ - (void)getReplyContentBodiesWithEventToReply:(MXEvent*)eventToReply
     {
         // The "Ended poll" text is not meant to be localized from the sender side.
         // This is why here we use a "default localizer" providing the english version of it.
-        senderMessageBody = MXSendReplyEventDefaultStringLocalizer.new.replyToEndedPoll;
+        senderMessageBody = MXSendReplyEventDefaultStringLocalizer.new.endedPollMessage;
     }
     else if (eventToReply.eventType == MXEventTypeBeaconInfo)
     {
@@ -2583,9 +2583,11 @@ - (MXHTTPOperation *)sendPollEndForEvent:(MXEvent *)pollStartEvent
     MXEventContentRelatesTo *relatesTo = [[MXEventContentRelatesTo alloc] initWithRelationType:MXEventRelationTypeReference
                                                                                        eventId:pollStartEvent.eventId];
 
+    MXSendReplyEventDefaultStringLocalizer* localizer = MXSendReplyEventDefaultStringLocalizer.new;
     NSDictionary *content = @{
         kMXEventRelationRelatesToKey: relatesTo.JSONDictionary,
-        kMXMessageContentKeyExtensiblePollEndMSC3381: @{}
+        kMXMessageContentKeyExtensiblePollEndMSC3381: @{},
+        kMXMessageContentKeyExtensibleTextMSC1767: localizer.endedPollMessage
     };
 
     return [self sendEventOfType:[MXTools eventTypeString:MXEventTypePollEnd] content:content threadId:threadId localEcho:localEcho success:success failure:failure];

diff --git a/MatrixSDK/Data/MXSendReplyEventDefaultStringLocalizer.m b/MatrixSDK/Data/MXSendReplyEventDefaultStringLocalizer.m
@@ -26,7 +26,7 @@ @interface MXSendReplyEventDefaultStringLocalizer ()
 @property (nonatomic, strong) NSString *senderSentTheirLocation;
 @property (nonatomic, strong) NSString *senderSentTheirLiveLocation;
 @property (nonatomic, strong) NSString *messageToReplyToPrefix;
-@property (nonatomic, strong) NSString *replyToEndedPoll;
+@property (nonatomic, strong) NSString *endedPollMessage;
 
 @end
 
@@ -44,7 +44,7 @@ - (instancetype)init
         _senderSentTheirLocation = @"has shared their location.";
         _senderSentTheirLiveLocation = @"Live location.";
         _messageToReplyToPrefix = @"In reply to";
-        _replyToEndedPoll = @"Ended poll";
+        _endedPollMessage = @"Ended poll";
     }
     return self;
 }

diff --git a/MatrixSDK/Data/MXSendReplyEventStringLocalizerProtocol.h b/MatrixSDK/Data/MXSendReplyEventStringLocalizerProtocol.h
@@ -32,7 +32,7 @@ NS_ASSUME_NONNULL_BEGIN
 - (NSString *)senderSentTheirLocation;
 - (NSString *)senderSentTheirLiveLocation;
 - (NSString *)messageToReplyToPrefix;
-- (NSString *)replyToEndedPoll;
+- (NSString *)endedPollMessage;
 
 @end
 

diff --git a/MatrixSDKTests/MXPollRelationTests.m b/MatrixSDKTests/MXPollRelationTests.m
@@ -66,6 +66,8 @@ - (void)testBobClosesPollWithOneAnswer
                             [mxSession.aggregations referenceEventsForEvent:pollStartEvent.eventId inRoom:room.roomId from:nil limit:-1 success:^(MXAggregationPaginatedResponse *paginatedResponse) {
                                 XCTAssertNil(paginatedResponse.nextBatch);
                                 XCTAssertEqual(paginatedResponse.chunk.count, 2);
+                                MXEvent* pollEndedEvent = paginatedResponse.chunk.lastObject;
+                                XCTAssertTrue([pollEndedEvent.content[kMXMessageContentKeyExtensibleTextMSC1767] isEqual:@"Ended poll"]);
 
                                 [expectation fulfill];
                             } failure:^(NSError *error) {
@@ -81,8 +83,6 @@ - (void)testBobClosesPollWithOneAnswer
                     XCTFail(@"The operation should not fail - NSError: %@", error);
                     [expectation fulfill];
                 }];
-
-                [expectation fulfill];
             } failure:^(NSError *error) {
                 XCTFail(@"The operation should not fail - NSError: %@", error);
                 [expectation fulfill];

diff --git a/changelog.d/pr-1713.change b/changelog.d/pr-1713.change
@@ -0,0 +1 @@
+Polls: add fallback text for poll ended events.
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Polls: add fallback text for poll ended events.