Merge branch 'zulip:main' into DmBackground

Author: E-m-i-n-e-n-c-e

.mailmap

@@ -15,7 +15,7 @@
 Chris Bobbe <[email protected]> <[email protected]>
 Greg Price <[email protected]> <[email protected]>
 Lalit Kumar Singh <[email protected]>
-Rajesh Malviya <[email protected]>
+Rajesh Malviya <[email protected]> <[email protected]>
 Shu Chen <[email protected]> <[email protected]>
 
 # The goal when editing this file is to group all of a given person's

lib/model/autocomplete.dart

@@ -449,7 +449,7 @@ class MentionAutocompleteView extends AutocompleteView<MentionAutocompleteQuery,
     required PerAccountStore store,
     required Narrow narrow,
   }) {
-    return store.users.values.toList()
+    return store.allUsers.toList()
       ..sort(_comparator(store: store, narrow: narrow));
   }
 
@@ -622,13 +622,13 @@ class MentionAutocompleteView extends AutocompleteView<MentionAutocompleteQuery,
       if (tryOption(WildcardMentionOption.all)) break all;
       if (tryOption(WildcardMentionOption.everyone)) break all;
       if (isComposingChannelMessage) {
-        final isChannelWildcardAvailable = store.account.zulipFeatureLevel >= 247; // TODO(server-9)
+        final isChannelWildcardAvailable = store.zulipFeatureLevel >= 247; // TODO(server-9)
         if (isChannelWildcardAvailable && tryOption(WildcardMentionOption.channel)) break all;
         if (tryOption(WildcardMentionOption.stream)) break all;
       }
     }
 
-    final isTopicWildcardAvailable = store.account.zulipFeatureLevel >= 224; // TODO(server-8)
+    final isTopicWildcardAvailable = store.zulipFeatureLevel >= 224; // TODO(server-8)
     if (isComposingChannelMessage && isTopicWildcardAvailable) {
       tryOption(WildcardMentionOption.topic);
     }

lib/model/compose.dart

@@ -5,6 +5,7 @@ import '../generated/l10n/zulip_localizations.dart';
 import 'internal_link.dart';
 import 'narrow.dart';
 import 'store.dart';
+import 'user.dart';
 
 /// The available user wildcard mention options,
 /// known to the server as [canonicalString].
@@ -127,11 +128,12 @@ String wrapWithBacktickFence({required String content, String? infoString}) {
 /// An @-mention of an individual user, like @**Chris Bobbe|13313**.
 ///
 /// To omit the user ID part ("|13313") whenever the name part is unambiguous,
-/// pass a Map of all users we know about. This means accepting a linear scan
+/// pass the full UserStore.  This means accepting a linear scan
 /// through all users; avoid it in performance-sensitive codepaths.
-String userMention(User user, {bool silent = false, Map<int, User>? users}) {
+String userMention(User user, {bool silent = false, UserStore? users}) {
   bool includeUserId = users == null
-    || users.values.where((u) => u.fullName == user.fullName).take(2).length == 2;
+    || users.allUsers.where((u) => u.fullName == user.fullName)
+         .take(2).length == 2;
 
   return '@${silent ? '_' : ''}**${user.fullName}${includeUserId ? '|${user.userId}' : ''}**';
 }
@@ -140,8 +142,8 @@ String userMention(User user, {bool silent = false, Map<int, User>? users}) {
 String wildcardMention(WildcardMentionOption wildcardOption, {
   required PerAccountStore store,
 }) {
-  final isChannelWildcardAvailable = store.account.zulipFeatureLevel >= 247; // TODO(server-9)
-  final isTopicWildcardAvailable = store.account.zulipFeatureLevel >= 224; // TODO(server-8)
+  final isChannelWildcardAvailable = store.zulipFeatureLevel >= 247; // TODO(server-9)
+  final isTopicWildcardAvailable = store.zulipFeatureLevel >= 224; // TODO(server-8)
 
   String name = wildcardOption.canonicalString;
   switch (wildcardOption) {
@@ -188,8 +190,8 @@ String quoteAndReplyPlaceholder(
   PerAccountStore store, {
   required Message message,
 }) {
-  final sender = store.users[message.senderId];
-  assert(sender != null);
+  final sender = store.getUser(message.senderId);
+  assert(sender != null); // TODO(#716): should use `store.senderDisplayName`
   final url = narrowLink(store,
     SendableNarrow.ofMessage(message, selfUserId: store.selfUserId),
     nearMessageId: message.id);
@@ -210,8 +212,8 @@ String quoteAndReply(PerAccountStore store, {
   required Message message,
   required String rawContent,
 }) {
-  final sender = store.users[message.senderId];
-  assert(sender != null);
+  final sender = store.getUser(message.senderId);
+  assert(sender != null); // TODO(#716): should use `store.senderDisplayName`
   final url = narrowLink(store,
     SendableNarrow.ofMessage(message, selfUserId: store.selfUserId),
     nearMessageId: message.id);

lib/model/content.dart

@@ -504,6 +504,58 @@ class EmbedVideoNode extends BlockContentNode {
   }
 }
 
+// See:
+//  https://ogp.me/
+//  https://oembed.com/
+//  https://zulip.com/help/image-video-and-website-previews#configure-whether-website-previews-are-shown
+class WebsitePreviewNode extends BlockContentNode {
+  const WebsitePreviewNode({
+    super.debugHtmlNode,
+    required this.hrefUrl,
+    required this.imageSrcUrl,
+    required this.title,
+    required this.description,
+  });
+
+  /// The URL from which this preview data was retrieved.
+  final String hrefUrl;
+
+  /// The image URL representing the webpage, content value
+  /// of `og:image` HTML meta property.
+  final String imageSrcUrl;
+
+  /// Represents the webpage title, derived from either
+  /// the content of the `og:title` HTML meta property or
+  /// the <title> HTML element.
+  final String? title;
+
+  /// Description about the webpage, content value of
+  /// `og:description` HTML meta property.
+  final String? description;
+
+  @override
+  bool operator ==(Object other) {
+    return other is WebsitePreviewNode
+      && other.hrefUrl == hrefUrl
+      && other.imageSrcUrl == imageSrcUrl
+      && other.title == title
+      && other.description == description;
+  }
+
+  @override
+  int get hashCode =>
+    Object.hash('WebsitePreviewNode', hrefUrl, imageSrcUrl, title, description);
+
+  @override
+  void debugFillProperties(DiagnosticPropertiesBuilder properties) {
+    super.debugFillProperties(properties);
+    properties.add(StringProperty('hrefUrl', hrefUrl));
+    properties.add(StringProperty('imageSrcUrl', imageSrcUrl));
+    properties.add(StringProperty('title', title));
+    properties.add(StringProperty('description', description));
+  }
+}
+
 class TableNode extends BlockContentNode {
   const TableNode({super.debugHtmlNode, required this.rows});
 
@@ -1339,6 +1391,113 @@ class _ZulipContentParser {
     return EmbedVideoNode(hrefUrl: href, previewImageSrcUrl: imgSrc, debugHtmlNode: debugHtmlNode);
   }
 
+  static final _websitePreviewImageSrcRegexp = RegExp(r'background-image: url\(("?)(.+?)\1\)');
+
+  BlockContentNode parseWebsitePreviewNode(dom.Element divElement) {
+    assert(divElement.localName == 'div'
+      && divElement.className == 'message_embed');
+
+    final debugHtmlNode = kDebugMode ? divElement : null;
+    final result = () {
+      if (divElement.nodes case [
+        dom.Element(
+          localName: 'a',
+          className: 'message_embed_image',
+          attributes: {
+            'href': final String imageHref,
+            'style': final String imageStyleAttr,
+          },
+          nodes: []),
+        dom.Element(
+          localName: 'div',
+          className: 'data-container',
+          nodes: [...]) && final dataContainer,
+      ]) {
+        final match = _websitePreviewImageSrcRegexp.firstMatch(imageStyleAttr);
+        if (match == null) return null;
+        final imageSrcUrl = match.group(2);
+        if (imageSrcUrl == null) return null;
+
+        String? parseTitle(dom.Element element) {
+          assert(element.localName == 'div' &&
+            element.className == 'message_embed_title');
+          if (element.nodes case [
+            dom.Element(localName: 'a', className: '') && final child,
+          ]) {
+            final titleHref = child.attributes['href'];
+            // Make sure both image hyperlink and title hyperlink are same.
+            if (imageHref != titleHref) return null;
+
+            if (child.nodes case [dom.Text(text: final title)]) {
+              return title;
+            }
+          }
+          return null;
+        }
+
+        String? parseDescription(dom.Element element) {
+          assert(element.localName == 'div' &&
+            element.className == 'message_embed_description');
+          if (element.nodes case [dom.Text(text: final description)]) {
+            return description;
+          }
+          return null;
+        }
+
+        String? title, description;
+        switch (dataContainer.nodes) {
+          case [
+            dom.Element(
+              localName: 'div',
+              className: 'message_embed_title') && final first,
+            dom.Element(
+              localName: 'div',
+              className: 'message_embed_description') && final second,
+          ]:
+            title = parseTitle(first);
+            if (title == null) return null;
+            description = parseDescription(second);
+            if (description == null) return null;
+
+          case [dom.Element(localName: 'div') && final single]:
+            switch (single.className) {
+              case 'message_embed_title':
+                title = parseTitle(single);
+                if (title == null) return null;
+
+              case 'message_embed_description':
+                description = parseDescription(single);
+                if (description == null) return null;
+
+              default:
+                return null;
+            }
+
+          case []:
+            // Server generates an empty `<div class="data-container"></div>`
+            // if website HTML has neither title (derived from
+            // `og:title` or `<title>…</title>`) nor description (derived from
+            // `og:description`).
+            break;
+
+          default:
+            return null;
+        }
+
+        return WebsitePreviewNode(
+          hrefUrl: imageHref,
+          imageSrcUrl: imageSrcUrl,
+          title: title,
+          description: description,
+          debugHtmlNode: debugHtmlNode);
+      } else {
+        return null;
+      }
+    }();
+
+    return result ?? UnimplementedBlockContentNode(htmlNode: divElement);
+  }
+
   BlockContentNode parseTableContent(dom.Element tableElement) {
     assert(tableElement.localName == 'table'
         && tableElement.className.isEmpty);
@@ -1583,6 +1742,10 @@ class _ZulipContentParser {
       }
     }
 
+    if (localName == 'div' && className == 'message_embed') {
+      return parseWebsitePreviewNode(element);
+    }
+
     // TODO more types of node
     return UnimplementedBlockContentNode(htmlNode: node);
   }

lib/model/internal_link.dart

@@ -60,7 +60,7 @@ String? decodeHashComponent(String str) {
 Uri narrowLink(PerAccountStore store, Narrow narrow, {int? nearMessageId}) {
   // TODO(server-7)
   final apiNarrow = resolveApiNarrowForServer(
-    narrow.apiEncode(), store.connection.zulipFeatureLevel!);
+    narrow.apiEncode(), store.zulipFeatureLevel);
   final fragment = StringBuffer('narrow');
   for (ApiNarrowElement element in apiNarrow) {
     fragment.write('/');