diff --git a/Riot/Riot-Defaults.plist b/Riot/Riot-Defaults.plist index 7b9df11ce..da87bc19d 100644 --- a/Riot/Riot-Defaults.plist +++ b/Riot/Riot-Defaults.plist @@ -25,9 +25,9 @@ webAppUrl https://riot.im/app integrationsUiUrl - https://scalar.vector.im/ + https://scalar-staging.riot.im/scalar-web/ integrationsRestUrl - https://scalar.vector.im/api + https://scalar-staging.riot.im/scalar/api apnsDeviceToken showAllEventsInRoomHistory diff --git a/Riot/ViewController/Widgets/IntegrationManagerViewController.m b/Riot/ViewController/Widgets/IntegrationManagerViewController.m index f52e9fa99..6add0083c 100644 --- a/Riot/ViewController/Widgets/IntegrationManagerViewController.m +++ b/Riot/ViewController/Widgets/IntegrationManagerViewController.m @@ -368,8 +368,9 @@ NSString *const kJavascriptSendResponseToModular = @"riotIOS.sendResponse('%@', { NSLog(@"[IntegrationManagerVC] Received request to invite %@ into room %@.", userId, roomId); - MXRoom *room = [mxSession roomWithRoomId:roomId]; - if (!room) + MXRoom *room = [self roomCheckWithEvent:eventData]; + + if (room) { MXRoomMember *member = [room.state memberWithUserId:userId]; if (member && member.membership == MXMembershipJoin) @@ -549,7 +550,7 @@ NSString *const kJavascriptSendResponseToModular = @"riotIOS.sendResponse('%@', if (room) { MXRoomMember *member = [room.state memberWithUserId:userId]; - [self sendNSObjectResponse:member.originalEvent.JSONDictionary toEvent:eventData]; + [self sendNSObjectResponse:member.originalEvent.content toEvent:eventData]; } }