thread creator update fixed

Author: JasminDreasond

android/app/build.gradle

@@ -8,7 +8,7 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         versionCode 1
-        versionName "1.3.32"
+        versionName "1.3.33"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         aaptOptions {
              // Files and dirs to omit from the packaged assets dir, modified to accommodate modern web apps.

info/dev/preparing-changelog.md

@@ -1,2 +1 @@
-- thread issue fixed.
-- crypto issue fixed.
+- Thread creator update fixed

ios/App/App.xcodeproj/project.pbxproj

@@ -350,7 +350,7 @@
 				INFOPLIST_FILE = App/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				MARKETING_VERSION = 1.3.32;
+				MARKETING_VERSION = 1.3.33;
 				OTHER_SWIFT_FLAGS = "$(inherited) \"-D\" \"COCOAPODS\" \"-DDEBUG\"";
 				PRODUCT_BUNDLE_IDENTIFIER = pony.house.matrix;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -370,7 +370,7 @@
 				INFOPLIST_FILE = App/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				MARKETING_VERSION = 1.3.32;
+				MARKETING_VERSION = 1.3.33;
 				PRODUCT_BUNDLE_IDENTIFIER = pony.house.matrix;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = "";

package.json

@@ -1,6 +1,6 @@
 {
   "name": "pony-house-matrix",
-  "version": "1.3.32",
+  "version": "1.3.33",
   "short_name": "Pony House",
   "description": "The open source house, your house, the house for all matrix ponies",
   "main": "dist-electron/main/index.js",

src/app/molecules/message/Message.jsx

@@ -1,12 +1,14 @@
-/* eslint-disable react/prop-types */
+/* eslint-disable react-hooks/rules-of-hooks */
 import React, { useState, useEffect, useCallback, useRef } from 'react';
 import PropTypes from 'prop-types';
+import generateApiKey from 'generate-api-key';
 
 import { MatrixEventEvent, RoomEvent, THREAD_RELATION_TYPE } from 'matrix-js-sdk';
 
 import clone from 'clone';
 import hljs from 'highlight.js';
 import * as linkify from 'linkifyjs';
+import cons from '@src/client/state/cons';
 
 import Text from '../../atoms/text/Text';
 import { hljsFixer, resizeWindowChecker, toast } from '../../../util/tools';
@@ -770,7 +772,6 @@ function MessageReactionGroup({ roomTimeline, mEvent }) {
     .sort((a, b) => reactions[a].index - reactions[b].index)
     .slice(0, reactionLimit);
 
-  // eslint-disable-next-line react-hooks/rules-of-hooks
   useEffect(() => mediaFix(itemEmbed, embedHeight, setEmbedHeight));
 
   return (
@@ -895,7 +896,6 @@ const MessageOptions = React.memo(
       selectRoom(roomId, eventId, eventId);
     };
 
-    // eslint-disable-next-line react-hooks/rules-of-hooks
     useEffect(() => {
       const newForceThread = (value) => setIsForceThreadVisible(value);
       matrixAppearance.on('forceThreadButton', newForceThread);
@@ -1065,8 +1065,12 @@ const MessageThreadSummary = React.memo(({ thread }) => {
     selectRoom(thread.roomId, undefined, thread.rootEvent?.getId());
   }
 
-  thread.on(RoomEvent.Timeline, () => {
-    setLastReply(thread.lastReply());
+  useEffect(() => {
+    const threadTimelineUpdate = () => setLastReply(thread.lastReply());
+    thread.on(RoomEvent.Timeline, threadTimelineUpdate);
+    return () => {
+      thread.off(RoomEvent.Timeline, threadTimelineUpdate);
+    };
   });
 
   return (
@@ -1260,13 +1264,15 @@ function Message({
   refRoomInput,
 }) {
   // Get Room Data
+  const { notifications } = initMatrix;
   const appearanceSettings = getAppearance();
   $(timelineSVRef?.current).trigger('scroll');
   const mx = initMatrix.matrixClient;
   const roomId = mEvent.getRoomId();
   const threadId = mEvent.getThread()?.id;
   const { editedTimeline, reactionTimeline } = roomTimeline ?? {};
 
+  const [existThread, updateExistThread] = useState(typeof threadId === 'string');
   const [embeds, setEmbeds] = useState([]);
   const [embedHeight, setEmbedHeight] = useState(null);
   const itemEmbed = useRef(null);
@@ -1368,7 +1374,6 @@ function Message({
     }
   }
 
-  // eslint-disable-next-line react-hooks/rules-of-hooks
   useEffect(() => {
     const bodyUrls = [];
     if (typeof body === 'string' && body.length > 0) {
@@ -1466,9 +1471,22 @@ function Message({
     };
   }, []);
 
-  // eslint-disable-next-line react-hooks/rules-of-hooks
   useEffect(() => mediaFix(itemEmbed, embedHeight, setEmbedHeight));
 
+  useEffect(() => {
+    const threadUpdate = (tth) => {
+      const thread = mEvent.getThread();
+      if (thread && tth.id === thread.id) {
+        if (!existThread) updateExistThread(true);
+      }
+    };
+
+    notifications.on(cons.events.notifications.THREAD_NOTIFICATION, threadUpdate);
+    return () => {
+      notifications.off(cons.events.notifications.THREAD_NOTIFICATION, threadUpdate);
+    };
+  });
+
   // Normal Message
   if (msgType !== 'm.bad.encrypted') {
     // Return Data
@@ -1553,7 +1571,12 @@ function Message({
                 <div ref={itemEmbed} className="message-embed message-url-embed">
                   {embeds.map((embed) => {
                     if (embed.data)
-                      return <Embed key={`msg_embed_${embed.eventId}`} embed={embed.data} />;
+                      return (
+                        <Embed
+                          key={`msg_embed_${embed.eventId}_${generateApiKey()}`}
+                          embed={embed.data}
+                        />
+                      );
                   })}
                 </div>
               ) : null}

src/app/organisms/navigation/Selector.jsx

@@ -1,4 +1,3 @@
-/* eslint-disable react/prop-types */
 import React, { useEffect, useState } from 'react';
 import PropTypes from 'prop-types';
 

src/app/organisms/room/RoomViewInput.jsx

@@ -1,4 +1,3 @@
-/* eslint-disable react/prop-types */
 import React, { useState, useEffect, useRef } from 'react';
 import PropTypes from 'prop-types';
 import TextareaAutosize from 'react-autosize-textarea';