Merge branch 'master' into upgrade-actions

jesec · Nov 15, 2023 · 22e1876 · 22e1876
2 parents 55a9e5b + 1192e14
commit 22e1876
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 11 deletions.
diff --git a/client/src/javascript/components/general/LinkedText.tsx b/client/src/javascript/components/general/LinkedText.tsx
@@ -18,15 +18,19 @@ function isValidHttpUrl(s: string) {
 }
 
 const LinkedText: FC<LinkedTextProps> = ({text, className}: LinkedTextProps) => {
-  const nodes = text.split(/\s/).map((s) =>
-    isValidHttpUrl(s.trimEnd()) ? (
-      <a href={s.trimEnd()} target="_blank" rel="noopener noreferrer">
-        {s}
-      </a>
-    ) : (
-      s
-    ),
-  );
+  const nodes = text.split(/([ \n])/).map((s) => {
+    if (s === '\n') {
+      return <br />;
+    }
+    if (isValidHttpUrl(s)) {
+      return (
+        <a href={s.trimEnd()} target="_blank" rel="noopener noreferrer">
+          {s}
+        </a>
+      );
+    }
+    return s;
+  });
 
   return <span className={className}>{nodes}</span>;
 };

diff --git a/client/src/javascript/components/modals/torrent-details-modal/TorrentGeneralInfo.tsx b/client/src/javascript/components/modals/torrent-details-modal/TorrentGeneralInfo.tsx
@@ -207,7 +207,7 @@ const TorrentGeneralInfo: FC = observer(() => {
               <Trans id="torrents.details.general.comment" />
             </td>
             <td className="torrent-details__detail__value">
-              {torrent.comment ? <LinkedText text={torrent.comment} /> : VALUE_NOT_AVAILABLE}
+              {torrent.comment ? <LinkedText text={torrent.comment.trim()} /> : VALUE_NOT_AVAILABLE}
             </td>
           </tr>
           <tr className="torrent-details__table__heading">

diff --git a/server/services/rTorrent/constants/methodCallConfigs/torrentList.ts b/server/services/rTorrent/constants/methodCallConfigs/torrentList.ts
@@ -22,7 +22,7 @@ const torrentListMethodCallConfigs = {
     methodCall: 'd.custom2=',
     transformValue: (value: unknown): string => {
       // ruTorrent sets VRS24mrkr as a comment prefix, so we use it as well for compatability
-      if (value === '' || typeof value !== 'string' || value.indexOf('VRS24mrker') !== 0) {
+      if (value === '' || typeof value !== 'string' || !value.startsWith('VRS24mrker')) {
         return '';
       }