fix: add ulink support for p chat and com request back

blocking e2e test

Signed-off-by: yqrashawn <[email protected]>

Author: yqrashawn

android/app/src/main/AndroidManifest.xml

@@ -71,6 +71,7 @@
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
                 <data android:scheme="status-app" />
+                <data android:scheme="status-im" />
                 <data android:scheme="ethereum" />
             </intent-filter>
         </activity>

ios/StatusIm/Info.plist

@@ -34,6 +34,7 @@
 			<key>CFBundleURLSchemes</key>
 			<array>
 				<string>status-app</string>
+				<string>status-im</string>
 			</array>
 		</dict>
 		<dict>

ios/StatusImPR/Info.plist

@@ -30,6 +30,7 @@
 			<key>CFBundleURLSchemes</key>
 			<array>
 				<string>status-app</string>
+				<string>status-im</string>
 			</array>
 		</dict>
 		<dict>

src/status_im/router/core.cljs

@@ -20,7 +20,7 @@
 
 (def ethereum-scheme "ethereum:")
 
-(def uri-schemes ["status-app://"])
+(def uri-schemes ["status-app://" "status-im://" "status-im:"])
 
 (def web-prefixes ["https://" "http://" "https://www." "http://www."])
 
@@ -30,6 +30,10 @@
 
 (def handled-schemes (set (into uri-schemes web-urls)))
 
+(def group-chat-extractor
+  {[#"(.*)" :params] {""  :group-chat
+                      "/" :group-chat}})
+
 (def eip-extractor
   {#{[:prefix "-" :address]
      [:address]}
@@ -40,7 +44,12 @@
 (def routes
   [""
    {handled-schemes {["c/" :community-data] :community
-                     ["cc/" :chat-data]     :community-chat
+                     ["cc/" :chat-data]     :community-channel
+                     ["ccm/" :chat-id]      :community-chat
+                     ["p/" :chat-id]        :private-chat
+                     ["cr/" :community-id]  :community-requests
+                     "g/"                   group-chat-extractor
+                     ["wallet/" :account]   :wallet-account
                      ["u/" :user-data]      :user}
     ethereum-scheme eip-extractor}])
 
@@ -58,7 +67,6 @@
 
 (defn match-uri
   [uri]
-  ;;
   (let [;; bidi has trouble parse path with `=` in it extract `=` here and add back to parsed
         ;; base64url regex based on https://datatracker.ietf.org/doc/html/rfc4648#section-5 may
         ;; include invalid base64 (invalid length, length of any base64 encoded string must be a
@@ -81,13 +89,13 @@
       ens?
       (assoc-in [:route-params :ens-name] fragment)
 
-      (and (or (= handler :community) (= handler :community-chat)) fragment)
+      (and (or (= handler :community) (= handler :community-channel)) fragment)
       (assoc-in [:route-params :community-id] fragment)
 
       (and equal-end-of-base64url (= handler :community) (:community-data route-params))
       (update-in [:route-params :community-data] #(str % equal-end-of-base64url))
 
-      (and equal-end-of-base64url (= handler :community-chat) (:chat-data route-params))
+      (and equal-end-of-base64url (= handler :community-channel) (:chat-data route-params))
       (update-in [:route-params :chat-data] #(str % equal-end-of-base64url))
 
       (and equal-end-of-base64url (= handler :user) (:user-data route-params))
@@ -238,8 +246,8 @@
     :community))
 
 (defn handle-uri
-  [chain _chats uri cb]
-  (let [{:keys [handler route-params]} (match-uri uri)]
+  [chain chats uri cb]
+  (let [{:keys [handler route-params query-params]} (match-uri uri)]
     (log/info "[router] uri " uri " matched " handler " with " route-params)
     (cond
 
@@ -253,36 +261,39 @@
       (and (= handler :user) (:user-id route-params))
       (match-contact-async chain route-params cb)
 
-      ;; ;; NOTE: removed in `match-uri`, might need this in the future
-      ;; (= handler :private-chat)
-      ;; (match-private-chat-async chain route-params cb)
+      ;; NOTE: removed in `match-uri`, might need this in the future
+      (= handler :private-chat)
+      (match-private-chat-async chain route-params cb)
 
-      ;; ;; NOTE: removed in `match-uri`, might need this in the future
-      ;; (= handler :group-chat)
-      ;; (cb (match-group-chat chats query-params))
+      ;; NOTE: removed in `match-uri`, might need this in the future
+      (= handler :group-chat)
+      (cb (match-group-chat chats query-params))
 
       (validators/valid-public-key? uri)
       (match-contact-async chain {:user-id uri} cb)
 
-      ;; ;; NOTE: removed in `match-uri`, might need this in the future
-      ;; (= handler :community-requests)
-      ;; (cb {:type handler :community-id (:community-id route-params)})
+      ;; NOTE: removed in `match-uri`, might need this in the future
+      (= handler :community-requests)
+      (cb {:type handler :community-id (:community-id route-params)})
 
       (and (= handler :community) (:community-id route-params))
       (cb {:type         (community-route-type route-params)
            :community-id (:community-id route-params)})
 
       ;; ;; TODO: jump to community overview for now, should jump to community channel
-      ;; (and (= handler :community-chat) (:chat-id route-params))
+      ;; (and (= handler :community-channel) (:chat-id route-params))
       ;; (cb {:type handler :chat-id (:chat-id route-params)})
 
-      (and (= handler :community-chat) (:community-id route-params))
+      (= handler :community-chat)
+      (cb {:type handler :chat-id (:chat-id route-params)})
+
+      (and (= handler :community-channel) (:community-id route-params))
       (cb {:type         (community-route-type route-params)
            :community-id (:community-id route-params)})
 
-      ;; ;; NOTE: removed in `match-uri`, might need this in the future
-      ;; (= handler :wallet-account)
-      ;; (cb (match-wallet-account route-params))
+      ;; NOTE: removed in `match-uri`, might need this in the future
+      (= handler :wallet-account)
+      (cb (match-wallet-account route-params))
 
       (address/address? uri)
       (cb (address->eip681 uri))

src/status_im/utils/universal_links/utils.cljs

@@ -16,12 +16,14 @@
 (defn universal-link?
   [url]
   (boolean
-   (re-matches constants/regx-universal-link url)))
+   (or (re-matches constants/regx-universal-link url)
+       (re-matches constants/regx-universal-link-deprecated url))))
 
 (defn deep-link?
   [url]
   (boolean
-   (re-matches constants/regx-deep-link url)))
+   (or (re-matches constants/regx-deep-link url)
+       (re-matches constants/regx-deep-link-deprecated url))))
 
 (defn generate-link
   [link-type domain-type param]

src/status_im2/constants.cljs

@@ -179,8 +179,10 @@
 (def regx-italic #"~[^~]+~")
 (def regx-backquote #"`[^`]+`")
 (def regx-universal-link #"((^https?://status.app/)|(^status-app://))[\x00-\x7F]+$")
+(def regx-universal-link-deprecated #"((^https?://status.app/)|(^status-im://))[\x00-\x7F]+$")
 (def regx-community-universal-link #"((^https?://status.app/)|(^status-app://))c/([\x00-\x7F]+)$")
 (def regx-deep-link #"((^ethereum:.*)|(^status-app://[\x00-\x7F]+$))")
+(def regx-deep-link-deprecated #"((^ethereum:.*)|(^status-im://[\x00-\x7F]+$))")
 (def regx-ens #"^(?=.{5,255}$)([a-zA-Z0-9-]+\.)*[a-zA-Z0-9-]+\.[a-zA-Z]{2,}$")
 (def regx-address #"^0x[a-fA-F0-9]{40}$")
 (def regx-address-contains #"(?i)0x[a-fA-F0-9]{40}")