Switch from m.content_warning to town.robin.msc3725.content_warning

SchildiChat · Sep 8, 2023 · 3fb8e2b · 3fb8e2b
1 parent 5735af5
commit 3fb8e2b
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/src/ContentMessages.ts b/src/ContentMessages.ts
@@ -498,7 +498,7 @@ export default class ContentMessages {
 
         // Attach content warning
         if (contentWarning) {
-            content["m.content_warning"] = {
+            content["town.robin.msc3725.content_warning"] = {
                 type: "m.spoiler" // Since the UI checkbox is labelled "Spoiler"
             }
         }

diff --git a/src/components/views/messages/MImageBody.tsx b/src/components/views/messages/MImageBody.tsx
@@ -83,7 +83,7 @@ export default class MImageBody extends React.Component<IBodyProps, IState> {
             imgError: false,
             imgLoaded: false,
             hover: false,
-            showImage: SettingsStore.getValue("showImages") && !this.props.mxEvent.getContent()["m.content_warning"],
+            showImage: SettingsStore.getValue("showImages") && !this.props.mxEvent.getContent()["town.robin.msc3725.content_warning"],
             placeholder: Placeholder.NoImage,
         };
     }

diff --git a/src/components/views/messages/MVideoBody.tsx b/src/components/views/messages/MVideoBody.tsx
@@ -177,7 +177,7 @@ export default class MVideoBody extends React.PureComponent<IBodyProps, IState>
                         decryptedUrl: `data:${mimetype},`,
                         decryptedThumbnailUrl: thumbnailUrl || `data:${mimetype},`,
                         decryptedBlob: null,
-                        showVideo: !content?.["m.content_warning"],
+                        showVideo: !content?.["town.robin.msc3725.content_warning"],
                     });
                 }
             } catch (err) {
@@ -190,7 +190,7 @@ export default class MVideoBody extends React.PureComponent<IBodyProps, IState>
         } else { // not encrypted
             const content = this.props.mxEvent.getContent<IMediaEventContent>();
             this.setState({
-                showVideo: !content?.["m.content_warning"],
+                showVideo: !content?.["town.robin.msc3725.content_warning"],
             })
         }
     }