From 3b6e26f96cd6a1e960e2afdbb512c421326ebddf Mon Sep 17 00:00:00 2001
From: ChronosX88 <chronosx88@gmail.com>
Date: Fri, 22 Nov 2019 22:36:50 +0400
Subject: [PATCH] Change 3PID in EntityID

---
 .gitignore            | 5 ++++-
 protocol-spec/core.md | 4 ++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 6a17dad..1bad2c5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,7 +19,8 @@
 .LSOverride
 
 # Icon must end with two \r
-Icon

+Icon
+
 
 # Thumbnails
 ._*
@@ -40,3 +41,5 @@ Network Trash Folder
 Temporary Items
 .apdisk
 
+/out
+
diff --git a/protocol-spec/core.md b/protocol-spec/core.md
index 16293f2..3f12eef 100644
--- a/protocol-spec/core.md
+++ b/protocol-spec/core.md
@@ -16,8 +16,8 @@ For starting we simply use JSON + Websockets.
 ## Entity ID
 * Room alias: `#<roomAlias>@<serverpart>`
 * Username: `@<username>@<serverpart>`
-* User ID with MSISDN (Mobile Station International Subscriber Directory Number): `%<msisdn without +>@<serverpart>`
-* User ID with Email: `^<email username>_at_<email hostname>@serverpart>`
+* User ID with any 3PID: `%<type>:<data>@<serverpart>`
+  * Currently supported only following types: `email` and `msisdn`.
 * Message ID: `&<uuid>@<serverpart (from which server the message was sent)>`
 * Room ID: `!<roomID>@<serverpart>`
 * Single server-part: `<serverpart>`